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

935090232@qq.com

2021-04-20 b58adf14617cd852296bec9e1ca57978741c9f0a

 zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java

@@ -56,7 +56,7 @@
   StatisticsBusinessDataJob sjobp;
   @RequestMapping(value = "/job")
   public @ResponseBody  String job() {
      sjobp.executeExt2();
      //sjobp.executeExt2();
      return "1";
   }