jinshihui пре 5 дана
родитељ
комит
34269f8e1b

+ 0 - 1
nightFragrance-massage/src/main/java/com/ylx/attendanceconfig/service/impl/AttendanceConfigServiceImpl.java

@@ -51,7 +51,6 @@ public class AttendanceConfigServiceImpl implements AttendanceConfigService {
 
         AttendanceRule rule = new AttendanceRule();
         rule.setRuleName(StrUtil.blankToDefault(StrUtil.trim(dto.getRuleName()), "默认考勤规则"));
-        rule.setMerchantId(StrUtil.trim(dto.getMerchantId()));
         rule.setBasicWorkHours(dto.getBasicWorkHours());
         rule.setWorkDurationRuleEnabled(dto.getWorkDurationRuleEnabled());
         rule.setStatus(ObjectUtil.defaultIfNull(dto.getStatus(), ENABLED));