~jiangyouyao/beauty-erp.git

jiangyouyao / beauty-erp

forked from beauty-erp

summary
commits
tree
docs
forks
compare

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-04-08 30f3c72b0b25ab0aaeb9dd5d9918de3b123ce5e6

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

@@ -189,7 +189,7 @@
      //获取当前登录人员信息
        QueryUtil.setQueryLimitCom(updateSignAwardSetDto);
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        Long actId = updateSignAwardSetDto.getActId();
        Long actId = updateSignAwardSetDto.getActMainId();
        Long companyId = user.getCompanyId();
        ShopActivities shopActivity = shopActivitiesDao.selectById(actId);
        //更新活动主表信息

			@@ -189,7 +189,7 @@
			//获取当前登录人员信息
			QueryUtil.setQueryLimitCom(updateSignAwardSetDto);
			SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
			Long actId = updateSignAwardSetDto.getActId();
			Long actId = updateSignAwardSetDto.getActMainId();
			Long companyId = user.getCompanyId();
			ShopActivities shopActivity = shopActivitiesDao.selectById(actId);
			//更新活动主表信息