|
|
46317684a3
|
桥机修复
|
2025-09-16 10:34:35 +08:00 |
|
|
|
004a5f4844
|
WorkTicketType权限修复
|
2025-09-16 10:00:27 +08:00 |
|
|
|
4d41de5d08
|
登录bug修复
|
2025-09-15 10:25:04 +08:00 |
|
|
|
2a0fb4bfd7
|
提交桥机接口
|
2025-09-15 09:19:05 +08:00 |
|
|
|
b3590f3194
|
提交桥机工作循环数据文档
|
2025-09-13 16:41:16 +08:00 |
|
|
|
4b48f4ed9e
|
修改jeecg生成代码模版
|
2025-09-13 13:55:37 +08:00 |
|
|
|
b4f248d7a3
|
项目数据权限
|
2025-09-13 10:24:05 +08:00 |
|
|
|
dd2b19626c
|
优化权限
|
2025-09-12 14:29:08 +08:00 |
|
|
|
bd1c89670a
|
优化权限
|
2025-09-12 13:41:52 +08:00 |
|
|
|
2316971b56
|
优化权限和bug修复
|
2025-09-11 11:21:50 +08:00 |
|
|
|
9e49c6f7bc
|
优化权限和bug修复
|
2025-09-10 20:26:17 +08:00 |
|
|
|
5fd01c5bb5
|
导入劳务人员bug修复
|
2025-09-10 10:24:42 +08:00 |
|
|
|
eb4823bf5a
|
优化权限和上传文件等
|
2025-09-09 17:55:41 +08:00 |
|
|
|
46e05204df
|
导入excel修改bug
|
2025-09-09 17:44:43 +08:00 |
|
|
|
fc1c57457e
|
优化狮子王接口
|
2025-09-09 11:19:08 +08:00 |
|
|
|
48f41ef72a
|
广播和视频分组导入
|
2025-09-08 17:04:43 +08:00 |
|
|
|
7aa4d307e7
|
转换Base64到webp格式和bug修复
|
2025-09-05 17:47:33 +08:00 |
|
|
|
b679c12c48
|
bug修复
|
2025-09-05 11:39:47 +08:00 |
|
|
|
8f7a2c206e
|
bug修复
|
2025-09-05 11:29:57 +08:00 |
|
|
|
d407d558af
|
广播接口和bug修复
|
2025-09-04 17:58:29 +08:00 |
|
|
|
c914692236
|
ocr施工日志施工单位权限bug修复
|
2025-09-04 14:35:30 +08:00 |
|
|
|
897d2c7f99
|
Merge branch 'prod' into uat
|
2025-09-04 11:37:41 +08:00 |
|
|
|
8be282781f
|
Merge branch 'mod_security' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceController.java
# src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListSourceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
|
2025-09-04 11:36:54 +08:00 |
|
|
|
9656de38e7
|
修复mysql不支持09-31
|
2025-09-04 11:32:57 +08:00 |
|
|
|
bc25c79962
|
bug修复
|
2025-09-03 16:47:58 +08:00 |
|
|
|
e6deadd6fe
|
bug修复
|
2025-09-02 17:04:35 +08:00 |
|
|
|
016ba73419
|
Merge branch 'prod' into mod_security
|
2025-09-02 13:56:51 +08:00 |
|
|
|
24b469a92b
|
考勤月报-按单位,最多导出41天
|
2025-09-02 10:48:41 +08:00 |
|
|
|
5b678c3ee1
|
bug修复和mysql批量替换值
|
2025-08-30 18:12:22 +08:00 |
|
|
|
a2ed0c329d
|
Merge branch 'mod_security' into prod
|
2025-08-30 17:05:30 +08:00 |
|
|
|
a5cc7c8874
|
bug修复
|
2025-08-30 17:04:09 +08:00 |
|
|
|
ab8c736792
|
扬尘增加蒸发量文档
|
2025-08-29 15:29:18 +08:00 |
|
|
|
cdd918d0ef
|
bug修复
|
2025-08-28 16:49:47 +08:00 |
|
|
|
9474d49433
|
Merge branch 'mod_security' into prod
|
2025-08-27 18:23:11 +08:00 |
|
|
|
1bead9cf22
|
bug修复
|
2025-08-27 18:16:03 +08:00 |
|
|
|
afdea2e5bb
|
bug修复
|
2025-08-27 17:47:11 +08:00 |
|
|
|
27182d10cc
|
青海中水北方修改
|
2025-08-27 15:19:43 +08:00 |
|
|
|
38c35543a0
|
Merge branch 'mod_security' into prod
|
2025-08-26 21:23:12 +08:00 |
|
|
|
c9747cfbef
|
bug修复
|
2025-08-26 19:29:39 +08:00 |
|
|
|
ffe6fe38a9
|
bug修复
|
2025-08-26 09:14:03 +08:00 |
|
|
|
328d0371c0
|
青海中水北方修改
|
2025-08-25 17:26:59 +08:00 |
|
|
|
98858b3b48
|
Merge remote-tracking branch 'origin/prod' into prod
|
2025-08-25 15:32:43 +08:00 |
|
|
|
686420e7d2
|
青海中水北方修改
|
2025-08-25 15:32:29 +08:00 |
|
|
|
8377079917
|
查询慢优化
|
2025-08-25 15:13:06 +08:00 |
|
|
|
fbf14e2502
|
查询慢优化
|
2025-08-25 15:12:24 +08:00 |
|
|
|
ee98e443e9
|
Merge remote-tracking branch 'origin/prod' into prod
|
2025-08-25 11:46:53 +08:00 |
|
|
|
6eb8ccdd72
|
青海中水北方修改
|
2025-08-25 11:44:27 +08:00 |
|
|
|
2bdd14aec2
|
bug修复
|
2025-08-22 19:47:15 +08:00 |
|
|
|
ca6f3100e1
|
bug修复
|
2025-08-22 14:39:56 +08:00 |
|
|
|
5b4b8a811c
|
Merge branch 'prod' into mod_security
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
# src/main/java/com/zhgd/xmgl/task/WorkerTask.java
|
2025-08-21 18:56:44 +08:00 |
|