Compare commits

..

No commits in common. "9ff735fdf7d6a9b24602c9ff20cedb343d6b6594" and "19a7fdc293007333d00866571c2db5dc3bacb07b" have entirely different histories.

5 changed files with 3 additions and 7 deletions

View File

@ -56,7 +56,7 @@ spring:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
# password: yhtkj@2024! # 密码,建议生产环境开启
password: yhtkj@2024! # 密码,建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.system.controller.admin.attendance.vo;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.group.AttendanceGroupDO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.experimental.Accessors;
@ -16,8 +15,6 @@ public class AttendanceRulesVO {
private String officeLocation;
@Schema(description = "是否允许外勤打卡 0否 1是")
private Integer fieldworkFlag;
@Schema(description = "考勤组信息")
private AttendanceGroupDO attendanceGroupDO;
@Data
public static class WorkRules {

View File

@ -954,7 +954,6 @@ public class AttendanceServiceImpl implements AttendanceService {
vo.setFieldworkFlag(group.getFieldworkFlag());
vo.setWorkRules(workRules);
vo.setOfficeLocation(group.getAddress());
vo.setAttendanceGroupDO(group);
return vo;
}

View File

@ -56,7 +56,7 @@ spring:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
# password: yhtkj@2024! # 密码,建议生产环境开启
password: yhtkj@2024! # 密码,建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################

View File

@ -56,7 +56,7 @@ spring:
host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
# password: yhtkj@2024! # 密码,建议生产环境开启
password: yhtkj@2024! # 密码,建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################