182 Commits

Author SHA1 Message Date
8d678b6b8a 冲突 2024-06-07 18:39:42 +08:00
88345a9d3d 1 2024-06-07 18:39:05 +08:00
f9656bba43 1 2024-06-07 18:36:41 +08:00
6f55ae0f5d 1 2024-06-07 18:18:47 +08:00
d49c5812c8 1 2024-06-07 18:17:55 +08:00
24e248f83e Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-06-07 18:16:05 +08:00
7593180df8 1 2024-06-07 18:15:50 +08:00
d1560cdaa1 冲突 2024-06-07 17:43:51 +08:00
369e89d21c 1 2024-06-07 17:43:23 +08:00
9cf1449d3f 提交视频 2024-06-07 17:41:10 +08:00
kun
421b538fb8 fix: BUG修改 2024-06-06 22:33:46 +08:00
kun
8078bc723d fix: BUG修改 2024-06-06 18:13:21 +08:00
kun
8316997393 fix: BUG修改 2024-06-06 09:47:49 +08:00
6e0c2b372d 提交 2024-06-05 22:28:18 +08:00
b802c2ca29 1 2024-06-05 20:24:55 +08:00
b44be63539 修复bug 2024-05-30 19:29:15 +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
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
1fba2d9c88 fix: BUG修改 2024-05-28 20:01:14 +08:00
kun
9acd6bc803 fix: BUG修改 2024-05-28 15:58:10 +08:00
Vce
b4dd2e48c2 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-27 21:08:00 +08:00
Vce
1bc73307f1 修改劳务人员显示环比 2024-05-27 21:07:26 +08:00
kun
8ca3345f44 fix: BUG修改 2024-05-27 19:44:30 +08:00
kun
b0db9fa7bb fix: BUG修改 2024-05-27 09:00:13 +08:00
kun
33ce5012d7 fix: BUG修改 2024-05-25 19:55:24 +08:00
kun
fbbe9d5df8 fix: BUG修改 2024-05-24 23:12:46 +08:00
895bb4f73e 合并冲突 2024-05-24 19:05:47 +08:00
afb67831c3 1 2024-05-24 19:01:59 +08:00
kun
90f120a995 fix: BUG修改 2024-05-24 19:01:30 +08:00
kun
934c222553 fix: 冲突解决以及BUG修改 2024-05-23 23:42:20 +08:00
kun
0f918dbde3 fix: BUG修改 2024-05-23 23:39:19 +08:00
312940d348 flx:修改bug 2024-05-23 20:06:14 +08:00
kun
d2a246f07a fix: BUG修改 2024-05-22 23:11:19 +08:00
de72340de5 修改报警 2024-05-22 22:52:32 +08:00
kun
ec58eefa80 fix: BUG修改 2024-05-22 20:52:14 +08:00
kun
f276a4ecf5 fix: BUG修改 2024-05-22 01:32:19 +08:00
kun
7c8c06df51 fix: BUG修改 2024-05-21 20:20:10 +08:00
kun
544a34abcc fix: BUG修改 2024-05-21 18:04:18 +08:00
kun
b772783350 fix: BUG修改 2024-05-21 01:19:28 +08:00
kun
c290437d2c fix: BUG修改 2024-05-20 13:49:45 +08:00
kun
605be55903 fix: BUG修改 2024-05-20 13:41:06 +08:00
kun
3c7f065acc fix: BUG修改 2024-05-19 19:17:58 +08:00
kun
79f3110a03 fix: BUG修改 2024-05-19 15:54:45 +08:00
kun
7f665d89ec fix: BUG修改 2024-05-18 20:26:34 +08:00
kun
ddd8071c03 fix: BUG修改 2024-05-18 18:49:30 +08:00