by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 2m43s
Details

Browse Source
This commit is contained in:
dy 2025-08-15 15:56:48 +08:00
parent ae8a1f095b
commit e66f29c665
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java
View File

@ -41,10 +41,10 @@ public class AttendanceArrangement extends TenantEntity {
*/ */
private Long groupId; private Long groupId;
/** // /**
* 区域id // * 区域id
*/ // */
private Long areaId; // private Long areaId;
/** /**
* 排班类型：1-固定班制，2-排班制 * 排班类型：1-固定班制，2-排班制

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java
View File

@ -45,10 +45,10 @@ public class AttendanceArrangementBo extends BaseEntity {
*/ */
private Long groupId; private Long groupId;
/** // /**
* 区域id // * 区域id
*/ // */
private Long areaId; // private Long areaId;
/** /**
* 排班类型：1-固定班制，2-排班制 * 排班类型：1-固定班制，2-排班制

10
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java
View File

@ -45,11 +45,11 @@ public class AttendanceArrangementVo implements Serializable {
@ExcelProperty(value = "考勤组ID") @ExcelProperty(value = "考勤组ID")
private Long groupId; private Long groupId;
@ExcelProperty(value = "区域Id") // @ExcelProperty(value = "区域Id")
/** // /**
* 区域id // * 区域id
*/ // */
private Long areaId; // private Long areaId;
/** /**
* 排班类型：1-固定班制，2-排班制 * 排班类型：1-固定班制，2-排班制

2
ruoyi-modules/pom.xml
View File

@ -15,7 +15,7 @@
<module>ruoyi-resource</module> <module>ruoyi-resource</module>
<module>ruoyi-workflow</module> <module>ruoyi-workflow</module>
<module>Property</module> <module>Property</module>
<!-- <module>Sis</module>--> <module>Sis</module>
</modules> </modules>
<artifactId>ruoyi-modules</artifactId> <artifactId>ruoyi-modules</artifactId>