Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

 zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java

@@ -61,6 +61,13 @@
      newSetting2.setCategory("仓库设置");
      newSettings.add(newSetting2);

      ParameterSettings newSetting3=new ParameterSettings();
      newSetting3.setCode(AppConstance.WECHARPAY_RECHARGE_NOTIFYURL);
      newSetting3.setName("储值卡充值回调地址");
      newSetting3.setType(1);
      newSetting3.setCategory("微信开发配置");
      newSettings.add(newSetting3);