427 Commits

Author SHA1 Message Date
kun
9845adb56a fix: BUG修改 2024-06-04 09:04:37 +08:00
kun
e13c96765a fix: BUG修改 2024-06-02 22:29:20 +08:00
kun
4a87984e36 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-02 22:28:58 +08:00
kun
d0ae3f23a8 fix: BUG修改 2024-06-02 22:28:55 +08:00
Vce
e1cea0452c Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-02 22:15:18 +08:00
Vce
51eaef822e 修改图片不显示的bug 2024-06-02 22:15:02 +08:00
kun
3cd80286e0 fix: BUG修改 2024-06-02 20:24:01 +08:00
kun
351c20632d fix: BUG修改 2024-06-02 20:21:55 +08:00
kun
3d1ab15e1e fix: BUG修改 2024-05-31 21:23:03 +08:00
kun
b049d8953e fix: 解决冲突 2024-05-31 19:00:25 +08:00
kun
691d655667 fix: BUG修改 2024-05-31 18:59:22 +08:00
kun
6d83b6e523 fix: BUG修改 2024-05-31 18:58:37 +08:00
kun
f8eff152e6 fix: BUG修改 2024-05-31 18:57:55 +08:00
kun
3384da8da0 fix: BUG修改 2024-05-31 18:57:26 +08:00
kun
2c5d15d390 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-31 18:56:59 +08:00
kun
4366e7017e fix: BUG修改 2024-05-31 18:56:56 +08:00
Vce
11e18aa12e 修改动火作业动火人及动火编号字段展示 2024-05-31 16:12:15 +08:00
kun
2e8edd25e5 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-30 21:58:33 +08:00
kun
fc58ff4e54 fix: BUG修改 2024-05-30 21:57:35 +08:00
d82429e83c 1 2024-05-30 19:46:48 +08:00
b44be63539 修复bug 2024-05-30 19:29:15 +08:00
33700dc5fe Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-05-30 17:53:48 +08:00
ffbc110aa6 1 2024-05-30 11:57:59 +08:00
kun
03e6121fe9 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-30 10:53:57 +08:00
kun
5619de9b04 fix: BUG修改 2024-05-30 10:53:54 +08:00
Vce
e4ebb8702e 修改进度上传是不能选择否的bug 2024-05-30 10:52:46 +08:00
kun
5718ecd0e1 fix: BUG修改 2024-05-30 09:13:50 +08:00
942cb3dc5b flx:冲突 2024-05-29 20:33:11 +08:00
4b33fc53a0 1 2024-05-29 20:29:43 +08:00
kun
1a9c140129 fix: BUG修改 2024-05-29 20:26:46 +08:00
kun
278df7f5b7 fix: BUG修改 2024-05-29 18:54:32 +08:00
kun
cd2d793ad6 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-29 18:01:30 +08:00
kun
4b513961d8 fix: BUG修改 2024-05-29 18:01:27 +08:00
Vce
2aaf035bc9 修改劳务管理环比 2024-05-29 17:20:00 +08:00
kun
7d113dfa78 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-29 00:03:19 +08:00
b16b2e8cd2 fix: BUG修改 2024-05-28 21:03:58 +08:00
kun
fc76daca2c Merge branch 'bjxz-rain' into bjxz-dev 2024-05-28 20:03:01 +08:00
kun
1fba2d9c88 fix: BUG修改 2024-05-28 20:01:14 +08:00
102f880519 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-05-28 19:56:13 +08:00
6dbde4a917 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-05-28 18:10:31 +08:00
26df94b28b Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-05-28 18:09:33 +08:00
4b1e8f2fc2 修改一键报警 2024-05-28 18:08:53 +08:00
kun
0047487dce Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-28 15:58:14 +08:00
kun
9acd6bc803 fix: BUG修改 2024-05-28 15:58:10 +08:00
Vce
8e6b41b9f9 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-28 11:03:34 +08:00
Vce
4664a4fb3c Merge branch 'bjxz-cjw' into bjxz-dev 2024-05-28 11:03:24 +08:00
Vce
b36ed37065 修改劳务管理考勤环比 2024-05-28 11:03:04 +08:00
kun
bbd7245c08 fix: 冲突解决 2024-05-27 21:53:02 +08:00
kun
08422bb506 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-27 21:51:51 +08:00
kun
0f8af40914 fix: BUG修改 2024-05-27 21:51:47 +08:00