Commit Graph

28 Commits

Author SHA1 Message Date
xyc
ef6727ba08 更新0811 2025-08-11 17:44:13 +08:00
xyc
b0bb97d65f Merge branch 'repair' 2025-08-08 16:07:03 +08:00
xyc
d051cbee66 Merge branch 'master' into repair 2025-08-08 11:30:24 +08:00
xyc
cf9b1f9234 更新0804 2025-08-04 16:14:04 +08:00
Lx
4a62d0fc52 0804 2025-08-04 10:22:56 +08:00
xyc
69188cd3e7 Merge branch 'master' into driver
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java
2025-08-01 17:28:10 +08:00
xyc
17b5bbf83b 更新0801 2025-08-01 17:25:38 +08:00
Lx
37030fb8c6 0801 2025-08-01 17:04:27 +08:00
Lx
af618e48af Merge branch 'refs/heads/master' into driver
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
2025-07-31 15:47:08 +08:00
Lx
1a16ec9015 0731 2025-07-31 15:37:54 +08:00
xyc
404227ca17 更新0731 2025-07-31 15:07:44 +08:00
xyc
215b1a9a04 更新0711 2025-07-11 13:31:20 +08:00
xyc
8db128ccc8 更新0711 2025-07-11 13:22:18 +08:00
xyc
999ee4d29c 更新 2025-06-23 17:38:35 +08:00
许允枞
34ef8ce13f 更新 2025-02-27 13:15:37 +08:00
许允枞
31b8047cff 更新 2025-02-26 18:06:45 +08:00
许允枞
423869f6ab 更新 2025-02-21 16:42:37 +08:00
许允枞
bbaeff1b19 更新 2025-02-19 18:02:39 +08:00
许允枞
dc28a00757 更新工作汇报相关代码 2025-02-10 17:59:53 +08:00
许允枞
756ce20950 更新检测员工相关功能 2025-01-22 17:55:40 +08:00
xiaofajia
4b6d66e9b4 修改 2024-12-19 17:48:24 +08:00
许允枞
018faeb051 更新 2024-11-25 16:46:51 +08:00
许允枞
6a75c68a5d 更新 2024-11-18 17:19:40 +08:00
a0675bb828 Merge branch 'dev'
# Conflicts:
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionWorkNodeMapper.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java
#	yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
2024-11-11 18:19:46 +08:00
许允枞
fd94f59ee1 websocket方法调用(检测) 2024-11-09 10:57:53 +08:00
PQZ
cccf884a2c 1 2024-11-07 15:15:49 +08:00
许允枞
baf972df52 检测系统,员工管理 2024-10-29 15:13:47 +08:00
Vinjor
fecc3fc5a1 1 2024-10-26 16:07:35 +08:00