Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-28 e04735fb7d9cf321f262a1d5338adc92d4856bc0

 zq-erp/src/main/resources/config/dev/system.properties

@@ -58,6 +58,12 @@
xcx_appid =wx3836ab3c1490ff29
xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47

#公众号
gzh_appid=wx57e6335559bdbda6
gzh_secret=ecb408af170e3890e6544290cad33760



#微信支付调试开关
wx_pay_debug_onoff = false