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

jyy

2021-01-28 e04735fb7d9cf321f262a1d5338adc92d4856bc0

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

@@ -60,7 +60,7 @@

#公众号
gzh_appid=wx57e6335559bdbda6
gzh_secret=123
gzh_secret=ecb408af170e3890e6544290cad33760