kun
|
f251a98c7f
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-05-16 09:29:57 +08:00 |
|
kun
|
113186cfa6
|
fix: BUG修改
|
2024-05-16 09:29:51 +08:00 |
|
Vce
|
7f6548678b
|
Merge branch 'bjxz-cjw' into bjxz-dev
|
2024-05-16 09:22:38 +08:00 |
|
Vce
|
564daf5700
|
暂存动火作业
|
2024-05-16 04:10:40 +08:00 |
|
kun
|
9f1d0c17ca
|
fix: 冲突解决
|
2024-05-15 18:20:51 +08:00 |
|
kun
|
79fc287548
|
fix: BUG修改
|
2024-05-15 18:20:19 +08:00 |
|
Vce
|
6757c9b76d
|
解决冲突
|
2024-05-15 18:18:45 +08:00 |
|
Vce
|
1c162d43e2
|
Merge branch 'bjxz-cjw' into bjxz-dev
|
2024-05-15 18:18:31 +08:00 |
|
Vce
|
33d62c9703
|
动火作业初版
|
2024-05-15 18:15:05 +08:00 |
|
kun
|
8bbb7463b6
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-05-14 20:14:50 +08:00 |
|
kun
|
04f6ca3e66
|
fix: BUG修改
|
2024-05-14 20:14:46 +08:00 |
|
Vce
|
ba5147bdad
|
发版1.5.4
|
2024-05-14 18:35:14 +08:00 |
|
Vce
|
903ac9abbf
|
添加动火框架
|
2024-05-14 18:16:51 +08:00 |
|
Vce
|
9382b8a2fc
|
修改材料出场图片显示BUG
|
2024-05-14 09:59:10 +08:00 |
|
kun
|
1b1691b67a
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-05-13 21:41:38 +08:00 |
|
kun
|
dac88e57f1
|
fix: BUG修改
|
2024-05-13 21:41:33 +08:00 |
|
Vce
|
8dfa9c759c
|
添加材料进出场图片显示
|
2024-05-13 17:03:17 +08:00 |
|
Vce
|
f873ede953
|
1
|
2024-05-13 12:48:32 +08:00 |
|
kun
|
ac9ac9919e
|
fix: BUG修改
|
2024-05-13 11:43:57 +08:00 |
|
kun
|
3eacd353b2
|
fix: 冲突解决
|
2024-05-13 09:52:36 +08:00 |
|
kun
|
878058dd64
|
fix: BUG修改
|
2024-05-13 09:51:19 +08:00 |
|
Vce
|
9d0baa511f
|
flx:修复修改密码页面
|
2024-05-13 09:38:51 +08:00 |
|
kun
|
ec2ce36f7c
|
Merge branch 'dev-Rain' into bjxz-dev
|
2024-05-13 01:40:10 +08:00 |
|
kun
|
5a03f576f5
|
fix: BUG修改
|
2024-05-13 01:38:41 +08:00 |
|
Vce
|
04512df2f5
|
1
|
2024-05-13 01:15:55 +08:00 |
|
kun
|
119b6d75a5
|
feat: 安全质量风险功能添加以及BUG修改
|
2024-05-13 00:53:24 +08:00 |
|
kun
|
ddfd00832f
|
fix: BUG修改
|
2024-05-12 11:13:54 +08:00 |
|
kun
|
884967964a
|
fix: 冲突解决
|
2024-05-12 01:53:05 +08:00 |
|
kun
|
217d60bddf
|
fix: BUG修改
|
2024-05-12 01:52:34 +08:00 |
|
Vce
|
651bd67321
|
修改危大工程BUG
|
2024-05-12 01:40:45 +08:00 |
|
Vce
|
60180ac9af
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-05-11 18:31:30 +08:00 |
|
Vce
|
68747319e6
|
修改危大工程BUG
|
2024-05-11 18:31:20 +08:00 |
|
kun
|
205fe2f107
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-05-11 03:00:55 +08:00 |
|
kun
|
794d971a01
|
fix: BUG修改
|
2024-05-11 03:00:50 +08:00 |
|
Vce
|
39d72c7d03
|
危大工程
|
2024-05-11 02:51:48 +08:00 |
|
Vce
|
beffce4330
|
暂存危大工程
|
2024-05-10 19:17:33 +08:00 |
|
Vce
|
aff391ccb8
|
暂存危大工程代码
|
2024-05-10 12:32:33 +08:00 |
|
Vce
|
a46a41906f
|
Merge branch 'bjxz-dev' into bjxz-cjw
|
2024-05-10 08:16:31 +08:00 |
|
Vce
|
23b4c7adcb
|
升级版本151
|
2024-05-10 01:47:34 +08:00 |
|
Vce
|
62401d6977
|
暂存代码
|
2024-05-09 22:52:28 +08:00 |
|
kun
|
3d5b121c77
|
fix: BUG修改
|
2024-05-09 20:29:41 +08:00 |
|
kun
|
71038b3fb6
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-05-09 16:43:25 +08:00 |
|
kun
|
92a700d3d4
|
fix: BUG修改
|
2024-05-09 16:43:21 +08:00 |
|
Vce
|
bb28c73dbc
|
Merge branch 'bjxz-dev' into bjxz-cjw
|
2024-05-09 14:13:07 +08:00 |
|
Vce
|
acdd2f4e74
|
把临时车替换为长期车
|
2024-05-09 14:05:48 +08:00 |
|
Vce
|
653b7a0265
|
Merge branch 'bjxz-dev' into bjxz-cjw
|
2024-05-09 13:12:27 +08:00 |
|
Vce
|
57150e4600
|
将所有劳务人员替换为施工人员
|
2024-05-09 13:10:52 +08:00 |
|
Vce
|
43a1ddd378
|
Merge branch 'bjxz-dev' into bjxz-cjw
|
2024-05-09 09:34:34 +08:00 |
|
Vce
|
11957c4d12
|
暂存代码
|
2024-05-09 01:11:09 +08:00 |
|
kun
|
4eb29cfc97
|
fix: BUG修改
|
2024-05-09 00:59:04 +08:00 |
|