201 Commits

Author SHA1 Message Date
Vce
ae212f4e4d 暂存四个特种作业 2024-05-17 06:36:51 +08:00
Vce
cad879bbf5 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 21:23:45 +08:00
Vce
3729854b67 暂存代码 2024-05-16 21:23:41 +08:00
kun
dc1d2e2f33 fix: BUG修改 2024-05-16 21:22:59 +08:00
kun
f1834ad2cd fix: BUG修改 2024-05-16 20:51:10 +08:00
kun
a8caacfc1a fix: BUG修改 2024-05-16 20:27:50 +08:00
kun
921e20f687 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 18:27:50 +08:00
kun
6873626d6a fix: BUG修改 2024-05-16 18:27:47 +08:00
Vce
1f57db9c78 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 18:21:48 +08:00
Vce
a6366b9cab 调整动火 2024-05-16 18:21:42 +08:00
kun
fdf1bf9865 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 18:21:02 +08:00
kun
b6f39e7ed2 fix: BUG修改 2024-05-16 18:20:59 +08:00
Vce
9fca9234f7 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 17:46:00 +08:00
Vce
e5619e0e77 修改动火作业票联动 2024-05-16 17:45:56 +08:00
kun
bfdcdc53ff Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 17:42:27 +08:00
kun
d436c184fd fix: BUG修改 2024-05-16 17:42:18 +08:00
Vce
2e5ae5693c 调整动火 2024-05-16 17:40:47 +08:00
Vce
77beb80abb 调整动火 2024-05-16 17:37:17 +08:00
Vce
d21f166887 调整危大 2024-05-16 17:34:35 +08:00
Vce
e1ecea990a 调整动火 2024-05-16 17:33:36 +08:00
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
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
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