334 Commits

Author SHA1 Message Date
Vce
198fb92369 调整动火 2024-05-16 17:32:53 +08:00
Vce
586e1486c9 修改动火 2024-05-16 17:06:46 +08:00
Vce
098c6dc849 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 16:55:57 +08:00
Vce
165f469190 调整动火 2024-05-16 16:55:53 +08:00
kun
0f90ed6d6f Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 16:55:00 +08:00
kun
6255abb483 fix: BUG修改 2024-05-16 16:54:56 +08:00
Vce
b1656cb321 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 16:54:15 +08:00
Vce
bbed73adf9 调整动火作业 2024-05-16 16:54:07 +08:00
kun
9c859a7b45 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 13:43:37 +08:00
kun
f9f3c90f6a feat: 视频回放功能页面添加 2024-05-16 13:43:33 +08:00
Vce
e2ba240c80 修改BUG 2024-05-16 12:23:30 +08:00
Vce
2d6b668396 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 12:14:49 +08:00
Vce
b2b8d0d0fd 修改bug 2024-05-16 12:14:42 +08:00
kun
fa4d203152 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 10:39:25 +08:00
kun
21a0c616ca fix: BUG修改 2024-05-16 10:39:22 +08:00
Vce
81e77f9de4 修改bug 2024-05-16 10:35:47 +08:00
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