Merge remote-tracking branch 'origin/mark' into yonghui

conf/app.conf

@@ -97,7 +97,7 @@ zhongwuAppSecret = "29435497822f52f3cf659c65da548a79"
 getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f"
 storeName = "京西菜市"
 
-useThingMap = false
+useThingMap = true
 
 [dev]
 jdOrgCode = "320406"
@@ -175,6 +175,7 @@ dingdingAppKey = "ding7iu9cptairtcls0c"
 dingdingSecret = "LWrZAFeqUfuVv7n_tc8vPpCAx6PT4CwManx2XCVhJOqGsx2L5XCDuX1sAN_JtvsI"
 
 dingdingCallbackURL = "http://callback.jxc4.com/dingding/msg"
+useThingMap = true
 
 [jxgy]
 httpport = 8088
@@ -233,6 +234,7 @@ getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
 getYLYTokenURL = "http://www.jxc4.com/v2/sys/GetYLYToken"
 
 storeName = "京西果园"
+useThingMap = true
 
 [test]
 jdOrgCode = "82029"
@@ -334,3 +336,4 @@ getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
 getWeimobTokenURL = "http://www.jxc4.com/v2/sys/GetWeimobToken"
 
 dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"
+useThingMap = true