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

jyy

2021-04-20 f50e081f650eb067cce44fce3db64a237fde145b

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

@@ -68,6 +68,12 @@
      newSetting3.setCategory("微信开发配置");
      newSettings.add(newSetting3);

      ParameterSettings newSetting4=new ParameterSettings();
      newSetting4.setCode(AppConstance.SHOP_MANAGE_JJCPAS_CONSUME);
      newSetting4.setName("家居产品销售是否生成消耗业绩");
      newSetting4.setType(1);
      newSetting4.setCategory("店务配置");
      newSettings.add(newSetting4);