|
|
9003c51453
|
Merge branch 'uat' into guoshengxiong
|
2025-07-23 15:15:51 +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 |
|
|
|
41d32bbda2
|
管控bug修改
|
2025-07-22 18:08:32 +08:00 |
|
|
|
c04d785c5f
|
管控bug修改
|
2025-07-21 10:42:03 +08:00 |
|
|
|
19df573b88
|
管控bug修改
|
2025-07-17 16:02:12 +08:00 |
|
|
|
7dfee323ee
|
企业大屏配置和修改
|
2025-07-16 09:08:34 +08:00 |
|
|
|
3a12d05af0
|
工作票bug修复和批量人员绑定设备
|
2025-07-11 17:28:09 +08:00 |
|
|
|
41b81aa2dd
|
工作票bug修复
|
2025-07-09 16:29:45 +08:00 |
|
|
|
19ceb728db
|
工作票bug修复
|
2025-07-09 10:06:07 +08:00 |
|
|
|
fe98b1766f
|
工作票bug修复
|
2025-07-08 10:03:24 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +08:00 |
|
|
|
76136770bc
|
中水北方修改
|
2025-07-04 17:45:30 +08:00 |
|
|
|
84cd5ac420
|
芊熠智能bug修复
|
2025-07-03 14:58:45 +08:00 |
|
|
|
daa3e585ac
|
增加查询参数
|
2025-07-01 16:01:47 +08:00 |
|
|
|
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 |
|
|
|
aeee70e7a5
|
Merge branch 'guoshengxiong' into uat
|
2025-06-21 13:40:55 +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 |
|
|
|
dcb2d4c364
|
Merge remote-tracking branch 'origin/uat' into uat
|
2025-06-20 16:17:02 +08:00 |
|
|
|
9df2ab273d
|
打包失败修改
|
2025-06-20 16:14:59 +08:00 |
|
|
|
af63949429
|
打包失败修改
|
2025-06-20 15:50:54 +08:00 |
|
|
|
6406b7cf96
|
maven3.6.0
|
2025-06-19 15:45:28 +08:00 |
|
|
|
c5562731d0
|
提交uat
|
2025-06-18 15:24:09 +08:00 |
|
|
|
8611fa6e34
|
Merge branch 'guoshengxiong' into uat
|
2025-06-17 10:54:38 +08:00 |
|
|
|
62f4aa4096
|
风险点、危险源、月度、隐患排查、排查执行bug修复
|
2025-06-17 10:53:42 +08:00 |
|
|
|
db2ff0124f
|
Merge branch 'guoshengxiong' into uat
|
2025-06-16 17:54:37 +08:00 |
|
|
|
783232ca11
|
Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
|
2025-06-16 17:52:43 +08:00 |
|
