Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

conf/app.conf

@@ -11,6 +11,11 @@ postwechatInfo = http://testapi.chioy.com.cn/api/network/postwechatInfo
 qrcodePrefix = bodycheck_
 followText = 您正在使用悦琦设备进行体检~
 resultURL = http://spaceofcheng.ycjcjy.com/wechat/bodyCheck.html
+<<<<<<< HEAD
+
+
+=======
+>>>>>>> fde828fc158d2341902a5a99478b79304adfb279
 
 [cros]
 allowMode = dev

conf/wechat.conf

@@ -1 +1 @@
-messageTplID = 1ft8YDwqOYwIHxTXXVlJh5Q7ST5qU1a0qlnF6B6TCBU
+messageTplID = EB1Bto8JmW-vC-A0NTe8NtxgMFm6s86l3g2Bc-1OP6U