郝彬
|
d8c76f97af
|
8-6 先commit再pull
|
2025-08-06 16:48:33 +08:00 |
|
郝彬
|
67d943af61
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoImportReq.java
# core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java
# core/src/main/resources/mapper/ProjectMapper.xml
# core/src/main/resources/mapper/UserMapper.xml
# pom.xml
# web/src/main/java/com/dite/znpt/web/controller/VideoController.java
|
2025-08-06 16:00:53 +08:00 |
cuizhibin
|
ac23b19b0a
|
合同新增字段
|
2025-08-06 15:03:03 +08:00 |
|
郝彬
|
dbbd3922f9
|
8-6 取消预算单同步删除数据库的使用记录，并撤回预算消费，创建项目时自动计算总预算
|
2025-08-06 14:30:30 +08:00 |
|
cuizhibin
|
4befd2d588
|
图片列表增加上传时间
|
2025-08-06 13:43:19 +08:00 |
|
cuizhibin
|
5aa29cc3dd
|
图片列表增加上传时间
|
2025-08-06 13:41:22 +08:00 |
|
郝彬
|
0548238a18
|
8-6 新增预算单同步修改数据库的使用记录
|
2025-08-06 10:02:38 +08:00 |
|
郝彬
|
1c136ed302
|
Merge remote-tracking branch 'origin/master'
|
2025-08-06 09:45:43 +08:00 |
|
郝彬
|
8c7a441662
|
8-6 根据项目id查询其相关预算汇总
|
2025-08-06 09:44:22 +08:00 |
wangna0328
|
f2d2800f79
|
修改部署后出现的报错
|
2025-08-06 09:38:41 +08:00 |
|
wangna0328
|
bce91a4951
|
修改后出现错误，版本回退
|
2025-08-06 09:21:21 +08:00 |
ybb
|
b94f7d3f44
|
Merge branch 'master' of https://gitee.com/xswl_123/dite-shixi-bakcend
|
2025-08-06 08:48:55 +08:00 |
|
ybb
|
d7066714e5
|
8/6,ybb文件模糊查询功能
|
2025-08-06 08:48:15 +08:00 |
|
cuizhibin
|
28ebad9966
|
文件列表排序
|
2025-08-05 21:42:16 +08:00 |
|
cuizhibin
|
9b963d43f5
|
被删除文件恢复
|
2025-08-05 21:38:54 +08:00 |
|
wangna0328
|
4c85f9197c
|
报错修改完成
|
2025-08-05 21:02:41 +08:00 |
|
wangna0328
|
1544e3e829
|
消除分支冲突
|
2025-08-05 20:44:22 +08:00 |
|
wangna0328
|
ade816ab3f
|
代码修改部分重新提交
|
2025-08-05 20:31:52 +08:00 |
|
cuizhibin
|
8c3da0878e
|
合并问题
|
2025-08-05 20:27:44 +08:00 |
|
cuizhibin
|
ffbf766cee
|
1.手动批量上传文件夹图像到项目(单张)
|
2025-08-05 20:24:55 +08:00 |
|
cuizhibin
|
b818eec318
|
1.批量上传图像校验部件id是否存在
|
2025-08-05 20:24:55 +08:00 |
gaoxiong
|
0a446e5f66
|
招投标
|
2025-08-05 20:24:45 +08:00 |
|
wangna0328
|
ec5cca1dab
|
自动检测初步代码，还未测试
|
2025-08-05 11:00:08 +08:00 |
|
郝彬
|
a49d01d23a
|
Merge branch 'master' of https://gitee.com/xswl_123/dite-shixi-bakcend
|
2025-08-05 10:15:11 +08:00 |
|
郝彬
|
351c8e0d8e
|
8-5 岗位字段新增
|
2025-08-05 10:14:30 +08:00 |
|
ybb
|
50c343402b
|
7-31 岗位查用户
|
2025-08-05 09:27:10 +08:00 |
|
wangna0328
|
75dd5815d2
|
制度代码最终版
|
2025-08-04 22:17:46 +08:00 |
|
cuizhibin
|
47fb031221
|
1.手动批量上传文件夹图像到项目增加信息
|
2025-08-04 20:24:56 +08:00 |
高雄
|
345b931de9
|
招标信息模板下载和招标信息导入
|
2025-08-04 20:24:56 +08:00 |
|
高雄
|
4cd953ff08
|
招投标
|
2025-08-04 20:24:56 +08:00 |
|
高雄
|
8db8dec22b
|
招投标
|
2025-08-04 20:24:49 +08:00 |
|
gaoxiong
|
6c698b5256
|
招投标
|
2025-08-04 20:24:32 +08:00 |
|
高雄
|
3717cbc4ce
|
招投标
|
2025-08-04 20:24:01 +08:00 |
 admin123
|
64d469210a
|
revert 3d7263248c
revert 1.增加项目日报功能
|
2025-08-04 20:07:07 +08:00 |
|
admin123
|
8e2e73f257
|
revert 258806b499
revert 制度模块按需求修改完成，且通过测试
|
2025-08-04 19:42:15 +08:00 |
Mr.j
|
d3e0851413
|
Revert "制度模块按需求修改完成，且通过测试"
This reverts commit 258806b499.
|
2025-08-04 19:35:00 +08:00 |
|
wangna0328
|
6ceda40d18
|
恢复如初，但发现其他bug
|
2025-08-04 19:32:38 +08:00 |
|
Mr.j
|
075d1daf02
|
Revert "Merge branch 'jgq' into master"
This reverts commit d4883a7fb2, reversing
changes made to 258806b499.
|
2025-08-04 17:46:42 +08:00 |
|
wangna0328
|
a50dbd89ce
|
制度模块代码
|
2025-08-04 17:24:13 +08:00 |
|
ybb
|
141c95f63e
|
Merge branch 'master' of https://gitee.com/xswl_123/dite-shixi-bakcend
# Conflicts:
# core/src/main/java/com/dite/znpt/mapper/BusinessDataMapper.java
# core/src/main/java/com/dite/znpt/service/BusinessDataService.java
# core/src/main/java/com/dite/znpt/service/impl/BusinessDataServiceImpl.java
# core/src/main/resources/mapper/BusinessDataMapper.xml
# web/src/main/java/com/dite/znpt/web/controller/BusinessDataController.java
|
2025-08-04 16:11:06 +08:00 |
|
ybb
|
944681f334
|
7-31 岗位查用户
|
2025-08-04 16:10:14 +08:00 |
|
郝彬
|
14428ca9ae
|
8-4 项目与合同关联、项目预算
|
2025-08-04 16:02:39 +08:00 |
|
郝彬
|
b188cbd181
|
8-4 商务资料管理系统（ybb）
|
2025-08-04 15:48:14 +08:00 |
|
Mr.j
|
d4883a7fb2
|
Merge branch 'jgq' into master
|
2025-08-04 14:28:59 +08:00 |
|
wangna0328
|
258806b499
|
制度模块按需求修改完成，且通过测试
|
2025-08-01 17:18:01 +08:00 |
|
郝彬
|
f84e1b5aa8
|
7-31 岗位查用户
|
2025-08-01 16:06:50 +08:00 |
|
Mr.j
|
02f5447be3
|
实现设备中心模块编辑，删除，查看详情，查看
|
2025-08-01 15:14:05 +08:00 |
|
Mr.j
|
8fe29807a8
|
实现设备中心模块手动新增设备
|
2025-08-01 11:21:59 +08:00 |
|
Mr.j
|
023455be47
|
实现设备中心模块数据库设计以及设备分页查询功能
|
2025-08-01 09:42:08 +08:00 |
|
wangna0328
|
78c23c019c
|
制度模块按需求修改完成，且通过测试
|
2025-07-31 15:04:46 +08:00 |