479 Commits

Author SHA1 Message Date
kun
c370f12058 fix: 合并代码解决冲突 2024-06-14 18:56:11 +08:00
kun
940c8674de fix: 修改劳务管理里面的数据校验同步、花名册的页面中的批量选择 2024-06-14 18:55:39 +08:00
dc15002725 flx:解决冲突 2024-06-13 21:52:55 +08:00
880072769c flx:修复地址路径 2024-06-13 21:51:18 +08:00
af0de85991 flx:修改劳务人员详情按钮权限 2024-06-13 21:17:22 +08:00
kun
072bd482d2 fix: 修改头部项目看板的显隐BUG 2024-06-13 20:27:06 +08:00
1b1e389a80 feat:消息推送弹窗延迟 2024-06-13 18:43:12 +08:00
48441e63d9 flx:冲突 2024-06-12 21:18:39 +08:00
622cddd3fa flx: 冲突 2024-06-12 19:32:28 +08:00
1a486c4ce4 fix:修改劳务数据校验、详情 进度管理按钮权限 2024-06-12 19:31:14 +08:00
kun
a031124ef4 fix: BUG修改 2024-06-12 16:14:55 +08:00
d94ff7a334 1 2024-06-11 21:49:25 +08:00
38498c2892 flx:冲突 2024-06-11 21:48:57 +08:00
845870b547 1 2024-06-11 21:48:11 +08:00
27b400978f 1 2024-06-11 21:43:42 +08:00
0ecbebdbec 1 2024-06-11 20:54:58 +08:00
e022c6a395 修改 2024-06-11 20:38:15 +08:00
b9014cbafe 冲突 2024-06-11 19:14:29 +08:00
d1085b7e02 1 2024-06-11 19:13:22 +08:00
kun
9e4ccfc3f0 fix: 解决冲突 2024-06-08 15:51:41 +08:00
kun
c09edaf307 fix: BUG修改 2024-06-08 15:51:10 +08:00
cfd40a702e 1 2024-06-07 23:30:59 +08:00
6d57d715da 1 2024-06-07 21:12:01 +08:00
a04cdb0cb7 提交 2024-06-07 19:58:48 +08:00
kun
fc7ae92eaf fix: BUG修改 2024-06-06 09:12:50 +08:00
kun
4601ae3873 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-06-05 23:28:33 +08:00
kun
273f480aa9 fix: BUG修改 2024-06-05 23:28:30 +08:00
cc1326954d flx:冲突 2024-06-05 22:35:15 +08:00
kun
ea81f0e729 fix: BUG修改 2024-06-05 21:23:02 +08:00
kun
dcb5148826 fix: BUG修改 2024-06-05 21:22:41 +08:00
1b2cd60e3f 1 2024-06-05 20:12:32 +08:00
74f442e0fb flx:冲突 2024-06-05 20:12:19 +08:00
2c526757ad 1 2024-06-05 20:11:36 +08:00
5e35c709af 提交车辆 2024-06-05 20:10:13 +08:00
7a2c3a6dc9 flx:冲突 2024-06-05 16:02:58 +08:00
ce86e2f40a 提交 2024-06-05 16:00:50 +08:00
kun
ca8c5b4352 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-06-05 15:16:28 +08:00
kun
13c0c5b1d5 fix: BUG修改 2024-06-05 15:16:25 +08:00
Vce
bd15c67d92 修改传参问题,以及怎加试题内容解析代码功能 2024-06-05 13:54:32 +08:00
kun
ac9264aef3 fix: 冲突解决 2024-06-04 22:43:28 +08:00
kun
c9e7cd4157 fix: BUG修改 2024-06-04 22:42:11 +08:00
1fdea82f01 提交访客 2024-06-04 22:27:07 +08:00
6c270c76c8 flx:冲突 2024-06-04 20:01:50 +08:00
6dc5b63d1f 1 2024-06-04 20:00:40 +08:00
kun
6ebf7b79ec fix: BUG修改 2024-06-04 18:05:22 +08:00
kun
1faf7538d1 fix: BUG修改 2024-06-04 11:27:03 +08:00
6e84efd6f7 flx: 冲突 2024-06-03 18:36:00 +08:00
a24816e26e flx:冲突 2024-06-03 15:21:20 +08:00
3ebf309508 1 2024-06-03 15:20:04 +08:00
kun
cbfeb5f133 fix: BUG修改 2024-06-03 11:19:12 +08:00