Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

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

@@ -102,3 +102,6 @@

#hive仓库地址
hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/

gzh_appid=wx57e6335559bdbda6
gzh_secret=ecb408af170e3890e6544290cad33760