382 Commits

Author SHA1 Message Date
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
d9ada299de 1 2024-05-27 21:45:49 +08:00
1c9371aa76 修改云控制台点击颜色 2024-05-27 21:20:49 +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
114ea17389 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-27 19:44:58 +08:00
kun
8ca3345f44 fix: BUG修改 2024-05-27 19:44:30 +08:00
7d0b01e711 1 2024-05-27 19:40:17 +08:00
1158fc557b 修改安全、质量隐患 2024-05-27 16:09:53 +08:00
kun
8ea94ef3ad Merge branch 'bjxz-rain' into bjxz-dev 2024-05-27 09:00:56 +08:00
kun
b0db9fa7bb fix: BUG修改 2024-05-27 09:00:13 +08:00
686cf0b04d 1 2024-05-26 19:13:56 +08:00
kun
6adf627be4 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-25 19:56:03 +08:00
kun
33ce5012d7 fix: BUG修改 2024-05-25 19:55:24 +08:00
566fbd7571 加扫码权限 2024-05-25 18:50:07 +08:00
Vce
e5537d0a81 修改标签 2024-05-25 17:23:22 +08:00
kun
2cd64c6bcc Merge branch 'bjxz-rain' into bjxz-dev 2024-05-24 23:56:11 +08:00
644c0aea99 1 2024-05-24 23:55:06 +08:00
e7f3088498 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-05-24 23:30:10 +08:00
afaa3ec479 1 2024-05-24 23:21:56 +08:00
30a239d8d9 1 2024-05-24 23:18:50 +08:00
48c97686b7 1 2024-05-24 23:17:59 +08:00
kun
4f45f2310d Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-24 23:12:50 +08:00
kun
fbbe9d5df8 fix: BUG修改 2024-05-24 23:12:46 +08:00
1edffb34ee 1 2024-05-24 23:12:34 +08:00
7471146119 1 2024-05-24 22:39:46 +08:00
7ec70b3900 1 2024-05-24 22:25:17 +08:00
996e8536dc Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-05-24 22:20:32 +08:00
Vce
a44b971c74 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-24 22:15:41 +08:00
Vce
352fa86151 Merge branch 'bjxz-cjw' into bjxz-dev 2024-05-24 22:15:37 +08:00
Vce
5c736f9b85 修改人员详情展示 2024-05-24 22:14:45 +08:00
1614881b4e 1 2024-05-24 22:13:09 +08:00
kun
d58922c17f Merge branch 'bjxz-rain' into bjxz-dev 2024-05-24 21:55:55 +08:00
kun
2142840bc3 fix: BUG修改 2024-05-24 21:55:22 +08:00
48b0902b90 1 2024-05-24 21:53:53 +08:00
e919faf285 1 2024-05-24 21:45:09 +08:00
kun
cb4ebb4c2a Merge branch 'bjxz-rain' into bjxz-dev 2024-05-24 21:13:32 +08:00
kun
aa622552bc fix: BUG修改 2024-05-24 21:13:08 +08:00
2e1de42595 巡检 2024-05-24 21:04:45 +08:00
895bb4f73e 合并冲突 2024-05-24 19:05:47 +08:00
afb67831c3 1 2024-05-24 19:01:59 +08:00
kun
d076271208 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-24 19:01:33 +08:00
kun
90f120a995 fix: BUG修改 2024-05-24 19:01:30 +08:00
60b57a0082 1 2024-05-24 16:03:23 +08:00
1a27280593 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-05-24 15:51:46 +08:00