|
|
0b0dfa754b
|
Merge branch 'uat' into mod_security
|
2025-08-05 15:23:20 +08:00 |
|
|
|
6652fbeaa6
|
安全隐患检查字段设置和安全隐患复查核验人设置
|
2025-08-04 11:57:56 +08:00 |
|
|
|
369847e9d3
|
接入SmartJavaAIOrc
|
2025-08-04 11:34:57 +08:00 |
|
|
|
1b0fb0331b
|
ocr和施工日志
|
2025-07-25 18:07:45 +08:00 |
|
|
|
5641225773
|
Merge branch 'icc' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
|
2025-07-24 10:35:10 +08:00 |
|
|
|
c5b1d70097
|
Merge branch 'xjw_attendance' into uat
# Conflicts:
# pom.xml
# src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
# src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
# src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
# src/main/java/com/zhgd/xmgl/util/Fileutils.java
|
2025-07-23 15:02:15 +08:00 |
|
|
|
19df573b88
|
管控bug修改
|
2025-07-17 16:02:12 +08:00 |
|
|
|
896ff7ba47
|
icc提交
|
2025-07-15 11:20:42 +08:00 |
|
|
|
2c58c0c019
|
doc接口文档提交
|
2025-06-27 15:22:42 +08:00 |
|
|
|
549c6fd610
|
新金湾，新考勤
|
2025-06-25 10:22:40 +08:00 |
|
|
|
c909bbf5cb
|
模板修改
模板修改
模板修改
模板修改
模板修改
|
2025-06-21 14:57:13 +08:00 |
|
|
|
25914cfcf0
|
打包失败修改
|
2025-06-21 14:01:05 +08:00 |
|
|
|
f592aff700
|
打包失败修改
|
2025-06-21 14:01:01 +08:00 |
|
|
|
9df2ab273d
|
打包失败修改
|
2025-06-20 16:14:59 +08:00 |
|
|
|
62f4aa4096
|
风险点、危险源、月度、隐患排查、排查执行bug修复
|
2025-06-17 10:53:42 +08:00 |
|
|
|
783232ca11
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2025-06-16 17:52:43 +08:00 |
|
|
|
20fa9355bf
|
风险点、危险源、月度、隐患排查、排查执行bug修复
|
2025-06-16 17:51:19 +08:00 |
|
|
|
e058f1881a
|
Merge branch 'prod' into guoshengxiong
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
|
2025-06-16 16:16:24 +08:00 |
|
|
|
d80d6f209e
|
中水北方功能调整
中水北方功能调整
|
2025-06-16 15:58:51 +08:00 |
|
|
|
82cf215ab3
|
风险点、危险源、月度、隐患排查、排查执行
风险点、危险源、月度、隐患排查、排查执行
|
2025-06-13 18:28:46 +08:00 |
|
|
|
11013f0cdd
|
模板修改
模板修改
模板修改
模板修改
模板修改
|
2025-06-11 11:23:19 +08:00 |
|
|
|
ee4af0566b
|
风险清单库
|
2025-06-06 14:19:44 +08:00 |
|
|
|
1058c49316
|
模拟数据生成
|
2025-05-10 11:51:35 +08:00 |
|
|
|
6e8b06cd93
|
AI功能
|
2025-04-11 17:30:52 +08:00 |
|
|
|
c9449cbf7b
|
备份标准版，提交工作流数据库
|
2025-04-09 11:15:27 +08:00 |
|
|
|
bbdca53ae1
|
备份标准版
|
2025-04-09 10:41:44 +08:00 |
|
|
|
2803e9bc68
|
备份标准版
|
2025-04-09 10:10:22 +08:00 |
|
|
|
37539074a4
|
dify资料以及接口
|
2025-03-21 11:21:39 +08:00 |
|
|
|
de2916d8be
|
安徽合武项目需求增加
|
2025-02-25 11:01:14 +08:00 |
|
|
|
d203bb2a59
|
考勤信息转发去除
|
2024-12-23 10:31:21 +08:00 |
|
|
|
79a7af577b
|
安全帽调整(中北水利)
|
2024-12-13 17:43:19 +08:00 |
|
|
|
4db491fb94
|
车辆定位bug修复
|
2024-11-29 13:41:59 +08:00 |
|
|
|
9203de6402
|
木垒修改
|
2024-10-29 18:51:03 +08:00 |
|
|
|
8515a15ab1
|
定时rtsp流截图
|
2024-10-29 09:41:50 +08:00 |
|
|
|
c2c38627d7
|
isc推数据到环境模块，污水取数据，车辆超速
|
2024-09-26 18:31:31 +08:00 |
|
|
|
8bf845a823
|
去掉口罩提示
|
2024-09-24 19:11:53 +08:00 |
|
|
|
eb3a5ed001
|
安全带接入
|
2024-09-20 17:03:06 +08:00 |
|
|
|
6e2efc5a73
|
人员定位修改
|
2024-09-19 16:45:37 +08:00 |
|
|
|
17da925e66
|
连接池配置改正确
|
2024-09-14 09:26:34 +08:00 |
|
|
|
13b12f861e
|
31个分支可以发布成功
|
2024-09-05 17:51:52 +08:00 |
|
|
|
956b934144
|
Revert "angang修改 合并"
This reverts commit ff2f335a
|
2024-09-05 17:40:44 +08:00 |
|
|
|
f2601c4e8f
|
调整
|
2024-09-03 09:48:54 +08:00 |
|
|
|
24e6d36d2a
|
调整
|
2024-09-02 17:22:36 +08:00 |
|
|
|
ff2f335ae5
|
angang修改 合并
|
2024-08-24 14:18:57 +08:00 |
|
|
|
723f3ffc0b
|
解决Unknown property used in expression: ${nrOfActivelnstances == 0}
|
2024-08-10 14:51:04 +08:00 |
|
|
|
b884819165
|
修改QueryGenerator和jeecg模版
|
2024-08-08 17:25:11 +08:00 |
|
|
|
999edf90ba
|
建筑施工安全检查标准大屏记录
|
2024-07-29 20:38:16 +08:00 |
|
|
|
fcb51e52ba
|
现场大屏弹幕和现场大屏节目单管理
|
2024-07-11 18:27:36 +08:00 |
|
|
|
8a827ecd50
|
bug修改和代码规范
|
2024-07-08 19:06:04 +08:00 |
|
|
|
b160b71b0f
|
代码规范
|
2024-07-05 19:07:36 +08:00 |
|
