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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java

@@ -120,7 +120,9 @@
         }
      }
      SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
      sysVipInfo.setCompanyId(user.getCompanyId());
      if(user!=null){
         sysVipInfo.setCompanyId(user.getCompanyId());
      }
      sysVipInfo.setCreateTime(new Date());
      sysVipInfo.setPointAll(0);
      sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);