Commit Graph

75 Commits (519c0be3e75075a1616bdab5a71ff1346fb6dcb9)

Author SHA1 Message Date
zhaoyu bbaad2b6d7 安全环保检查状态改8 2023-11-22 17:52:09 +08:00
dearlin 6d238d6cc1 fix: 重点工程处罚管理 里面的隐患没有区分重点工程项目 每个重点工程点进去都一样 2023-11-22 16:56:33 +08:00
zhaoyu 86e10c7966 Merge branch 'dev' into 1122-动火台账 2023-11-22 16:33:18 +08:00
zhaoyu e3be1f21d7 Merge branch 'zdgc-duanxin' into dev 2023-11-22 16:31:40 +08:00
zhaoyu a4e65f049f 动火台账增加展示以及搜索条件 2023-11-22 14:37:03 +08:00
limingyu ff9dc890bf Merge remote-tracking branch 'origin/dev' into lmy20231113 2023-11-17 14:19:56 +08:00
zhaoyu 8e5325bd17 调整处罚短信接口逻辑 2023-11-16 17:20:16 +08:00
dearlin 4678fb2bc3 fix:测试环境配置文件修正 2023-11-15 16:25:34 +08:00
dearlin d1600cd7ce fix:ai报警手机端不显示隐患验收的信息 2023-11-14 14:07:41 +08:00
dearlin 86b4493820 fix:ai报警不存隐患发现人公司的问题 2023-11-14 11:31:00 +08:00
dearlin 2cc9c41b49 fix:重点工程检查企业端来源不正确的问题 2023-11-14 10:57:54 +08:00
limingyu 5b22778601 曹妃甸动火作业搬到港务局 2023-11-14 10:16:26 +08:00
wangxuan f6d7669a2d Merge pull request 'x11.8smb修复问题,相关方展示集团单位' (#2) from x11.8 into dev
Reviewed-on: #2
2023-11-08 17:58:09 +08:00
dearlin 1197111074 fix:smb空指针问题修复 2023-11-08 17:15:45 +08:00
dearlin 8fc5375db9 一般隐患台账导出,监管端的创建人和发现人 没有显示数据 注意按列导出 2023-11-08 14:37:24 +08:00
wangxuan b5b5aba4dc Merge pull request 'BUILD: x1108改造配置文件方便部署' (#1) from x1108 into dev
Reviewed-on: #1
2023-11-08 11:09:48 +08:00
dearlin 15d9942227 删除无用的文件 2023-11-08 11:06:39 +08:00
dearlin 8f1868e6cd 改造配置文件 2023-11-08 10:24:18 +08:00
guoyuepeng a95159f2b2 Merge remote-tracking branch 'origin/main' 2023-11-08 08:54:04 +08:00
guoyuepeng 71846cb62a 初始化 2023-11-08 08:53:50 +08:00
guoyuepeng e12f39b0c5 删除 ceshi.text 2023-11-07 09:33:23 +08:00
guoyuepeng 5834f47ec2 删除 2ceshi.text 2023-11-07 09:33:15 +08:00
guoyuepeng 9e993610b0 初始化 2023-11-07 09:32:12 +08:00
guoyuepeng 99b446ada6 添加 2ceshi.text 2023-11-07 09:16:22 +08:00
guoyuepeng 93ec42f940 添加 ceshi.text 2023-11-07 09:16:15 +08:00