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

jyy

2021-01-16 9253517ff8a10e2df7924fdf6e0b737544d1a859

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

@@ -43,6 +43,7 @@
   public @ResponseBody AjaxResult addOrModify(SysVipLevel vipLevel) {
      SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
      vipLevel.setShopId(users.getShopId());
      vipLevel.setCompanyId(users.getCompanyId());
      if (vipLevel.getId() != null) {

         return modify(cardLevelService, vipLevel, "会员卡信息");