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

935090232@qq.com

2021-07-29 aecf1e6808cd9eca68f5ec87340bd6c92f8c464c

 zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java

@@ -33,7 +33,7 @@
   @RequestMapping(value = "/showList")
   public @ResponseBody AjaxResult showList(SysVipLevel vipLevel,PaginationVO pageVo) {
      SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
      vipLevel.setShopId(users.getShopId());
      vipLevel.setCompanyId(users.getCompanyId());
      return showList(cardLevelService,vipLevel,pageVo);
   }
   /**