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

jyy

2021-04-14 6ada97d503bd93722c081b66a9adcce7599e5536

 zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java

@@ -53,6 +53,9 @@
      //获取当前登录人员信息
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        Long companyId = user.getCompanyId();
        /**
         * todo签到活动的唯一性
         */
        
        //新增活动主表信息
        ShopActivities shopActivities = new ShopActivities();