|
|
58faeb161e
|
Merge branch 'prod' into guoshengxiong
|
2025-07-01 15:04:18 +08:00 |
|
|
|
0ba2865b17
|
Merge branch 'xjw_attendance' into prod
|
2025-07-01 15:03:50 +08:00 |
|
|
|
db34228767
|
整合扬尘hj212
|
2025-07-01 15:03:04 +08:00 |
|
|
|
121deb6de5
|
扬尘查询慢修复
|
2025-07-01 13:40:30 +08:00 |
|
|
|
8bfcbfa068
|
Merge branch 'prod' into guoshengxiong
|
2025-07-01 10:02:03 +08:00 |
|
|
|
13cf189faa
|
黑名单退场bug修复
|
2025-06-30 18:00:17 +08:00 |
|
|
|
6113f6279a
|
新增黑名单退场、考勤v2bug修复
|
2025-06-30 17:49:54 +08:00 |
|
|
|
8df811c816
|
Merge branch 'prod' into guoshengxiong
|
2025-06-30 15:09:39 +08:00 |
|
|
|
65338aecc9
|
对接小萨塔吊
|
2025-06-30 15:09:10 +08:00 |
|
|
|
2e475dcf9f
|
提交.gitignore
|
2025-06-30 14:35:48 +08:00 |
|
|
|
fd9513b805
|
Merge branch 'xjw_attendance' into prod
|
2025-06-27 19:59:46 +08:00 |
|
|
|
d55d074bfc
|
新金湾，新考勤bug修复
|
2025-06-27 19:43:46 +08:00 |
|
|
|
321bf741f5
|
新金湾，新考勤app
|
2025-06-27 18:44:18 +08:00 |
|
|
|
2c58c0c019
|
doc接口文档提交
|
2025-06-27 15:22:42 +08:00 |
|
|
|
7f8e40184b
|
Merge branch 'prod' into guoshengxiong
# Conflicts:
# src/main/java/com/zhgd/xmgl/util/Fileutils.java
|
2025-06-25 18:46:17 +08:00 |
|
|
|
9bac301159
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2025-06-25 18:45:02 +08:00 |
|
|
|
c70dcc5562
|
新金湾，新考勤bug修复
|
2025-06-25 18:26:09 +08:00 |
|
|
|
10d2b693b2
|
新金湾，新考勤bug修复
|
2025-06-25 16:44:48 +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 |
|
|
|
e8fa663b22
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2025-06-21 11:59:50 +08:00 |
|
|
|
aacfd760a5
|
管控清单危险源数据中心和bug修复
|
2025-06-21 11:59:34 +08:00 |
|
|
|
c370ebb538
|
打包失败修改
|
2025-06-20 16:57:28 +08:00 |
|
|
|
c4c6d01150
|
打包失败修改
|
2025-06-20 16:57:25 +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 |
|
|
|
04c25beb23
|
Merge remote-tracking branch 'origin/zsbf_0613' into zsbf_0613
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendancePresenceMapper.xml
|
2025-06-16 15:59:47 +08:00 |
|
|
|
d80d6f209e
|
中水北方功能调整
中水北方功能调整
|
2025-06-16 15:58:51 +08:00 |
|
|
|
0c2b54d07b
|
中水北方功能调整
|
2025-06-16 09:13:57 +08:00 |
|
|
|
82cf215ab3
|
风险点、危险源、月度、隐患排查、排查执行
风险点、危险源、月度、隐患排查、排查执行
|
2025-06-13 18:28:46 +08:00 |
|
|
|
11013f0cdd
|
模板修改
模板修改
模板修改
模板修改
模板修改
|
2025-06-11 11:23:19 +08:00 |
|
|
|
502d11cac6
|
海康ai获取区域入侵图片
|
2025-06-10 16:04:47 +08:00 |
|
|
|
637411421b
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2025-06-10 11:07:06 +08:00 |
|
|
|
34e5630443
|
进洞时间修改yyyy-MM-dd HH:mm:ss
|
2025-06-10 11:06:59 +08:00 |
|
|
|
8200f6efd8
|
bug修改
|
2025-06-09 18:55:32 +08:00 |
|
|
|
f46d9368f1
|
模拟数据生成
|
2025-06-09 14:15:02 +08:00 |
|
|
|
d4fbd26cb7
|
基建大屏
|
2025-06-09 09:09:00 +08:00 |
|
|
|
ee4af0566b
|
风险清单库
|
2025-06-06 14:19:44 +08:00 |
|
|
|
ffac33b47b
|
基建大屏
|
2025-06-04 16:14:35 +08:00 |
|
|
|
d6d5456157
|
模拟数据配置
|
2025-05-30 17:33:02 +08:00 |
|
|
|
6a2706a31c
|
测试推送新git仓库
|
2025-05-29 17:10:36 +08:00 |
|
|
|
3c07e9e6a0
|
基建项目
|
2025-05-29 15:24:17 +08:00 |
|
|
|
ec86d09c76
|
模拟数据生成
|
2025-05-29 14:42:30 +08:00 |
|
|
|
50532d993b
|
模拟数据生成
|
2025-05-29 09:13:04 +08:00 |
|
|
|
4a1f52465c
|
模拟数据生成
|
2025-05-28 09:57:12 +08:00 |
|
|
|
735d67c44e
|
模拟数据生成
|
2025-05-27 16:34:26 +08:00 |
|
