1977 Commits

Author SHA1 Message Date
f5c36d0b89 1 2024-06-04 19:58:19 +08:00
kun
77df5422fd fix: 代码合并 2024-06-04 18:09:27 +08:00
6bf48a2c35 flx:冲突 2024-06-04 18:07:48 +08:00
370fef6b8c 提交 2024-06-04 18:06:21 +08:00
kun
6ebf7b79ec fix: BUG修改 2024-06-04 18:05:22 +08:00
kun
af72b5bc31 fix: 解决冲突 2024-06-04 11:27:48 +08:00
kun
1faf7538d1 fix: BUG修改 2024-06-04 11:27:03 +08:00
Vce
4085540580 修改bug 2024-06-04 09:33:58 +08:00
d91b0fe4df Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain 2024-06-03 21:18:55 +08:00
68216a02cb flx:冲突 2024-06-03 21:17:54 +08:00
e42e6b4081 flx:冲突 2024-06-03 21:16:33 +08:00
90e93dae6a Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain 2024-06-03 21:13:59 +08:00
27c3271cd6 1 2024-06-03 19:33:53 +08:00
kun
14c72e598c fix: BUG修改 2024-06-03 19: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
kun
35a9fe87f8 fix: BUG修改 2024-06-03 11:16:19 +08:00
ddff66dcaf 提交 2024-06-03 09:19:31 +08:00
3ef18d279d flx:冲突 2024-06-03 09:19:14 +08:00
123a0f16f2 提交劳务 数据校验同步报告 2024-06-03 09:17:20 +08:00
Vce
46e5ed43a8 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-06-03 00:22:26 +08:00
Vce
db00c59218 修改导入失败提示 2024-06-03 00:22:22 +08:00
kun
bff1083bbd fix: BUG修改 2024-06-02 23:54:36 +08:00
kun
1d997c03c7 fix: BUG修改 2024-06-02 22:30:05 +08:00
kun
ad80bb2802 fix: BUG修改 2024-06-02 20:59:21 +08:00
kun
3416fe46ea Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-06-02 14:19:27 +08:00
kun
f7e9eaf7c4 fix: BUG修改 2024-06-02 14:19:24 +08:00
Vce
f5e489c9ce Merge branch 'bjxz-cjw' into bjxz-dev 2024-06-01 23:24:35 +08:00
Vce
b29b69cc57 添加题库导入导出功能 2024-06-01 23:24:03 +08:00
Vce
a0a756548c 修改权限 2024-06-01 12:43:02 +08:00
kun
17dace103f Merge branch 'bjxz-rain' into bjxz-dev 2024-05-31 19:55:11 +08:00
c8f89c5267 修改人员信息详情 上传多张图片 2024-05-31 19:29:23 +08:00
kun
13d286a9ed fix: 冲突解决 2024-05-31 18:55:24 +08:00
kun
786fcb45f6 fix: BUG修改 2024-05-31 18:53:56 +08:00
514fd9f181 修改进度和合作单位 2024-05-31 18:53:05 +08:00
80d802d223 提交动火 2024-05-31 18:51:46 +08:00
kun
da56a7ba60 fix: BUG修改 2024-05-31 18:46:57 +08:00
kun
6b778bbfbb fix: BUG修改 2024-05-31 18:31:38 +08:00
kun
60b85aceab fix: BUG修改 2024-05-31 13:08:30 +08:00
09a858adbb flx: 冲突 2024-05-31 11:25:00 +08:00
dfe5340026 修复项目基本信息模块 合作单位 2024-05-31 11:22:35 +08:00
kun
a0a7a3260f fix: BUG修改 2024-05-31 10:19:10 +08:00
kun
3605ad2c65 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-31 10:14:51 +08:00
851f27d063 1 2024-05-31 10:13:56 +08:00
37875871ee Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain 2024-05-31 10:10:15 +08:00
kun
a556303333 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-31 10:10:10 +08:00
kun
25b0d10b29 fix: BUG修改 2024-05-31 10:10:07 +08:00
7fc85dce1c 1 2024-05-31 10:09:38 +08:00