cuizhibin
|
3ec94f8487
|
删除convertsImpl
|
2025-08-07 15:40:31 +08:00 |
|
cuizhibin
|
e557a5df86
|
Merge branch 'merge'
# Conflicts:
# core/src/main/java/com/dite/znpt/domain/dto/FolderDto.java
# core/src/main/java/com/dite/znpt/domain/entity/BusinessDataEntity.java
# core/src/main/java/com/dite/znpt/domain/entity/BusinessDataFileEntity.java
# core/src/main/java/com/dite/znpt/domain/entity/EquipmentEntity.java
# core/src/main/java/com/dite/znpt/domain/page/PageBean.java
# core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoDetailResp.java
# core/src/main/java/com/dite/znpt/enums/HealthStatusEnum.java
# core/src/main/java/com/dite/znpt/enums/LocationStatusEnum.java
# core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java
# core/src/main/java/com/dite/znpt/mapper/BusinessDataMapper.java
# core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java
# core/src/main/java/com/dite/znpt/service/BusinessDataService.java
# core/src/main/java/com/dite/znpt/service/EmailService.java
# core/src/main/java/com/dite/znpt/service/ProjectBudgetInfoService.java
# core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/BusinessDataServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/EmailServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/InMemoryVerificationCodeStore.java
# core/src/main/java/com/dite/znpt/service/impl/ProjectBudgetInfoServiceImpl.java
# core/src/main/resources/mapper/BusinessDataFileMapper.xml
# core/src/main/resources/mapper/BusinessDataMapper.xml
# web/src/main/java/com/dite/znpt/web/controller/BusinessDataController.java
# web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java
# web/src/main/java/com/dite/znpt/web/controller/EmailController.java
# web/src/main/java/com/dite/znpt/web/controller/EquipmentController.java
# web/src/main/java/com/dite/znpt/web/controller/PostController.java
# web/src/main/java/com/dite/znpt/web/controller/ProjectBudgetInfoController.java
|
2025-08-07 15:38:22 +08:00 |
|
cuizhibin
|
a996310f25
|
代码合并问题处理
|
2025-08-07 15:33:32 +08:00 |
wangna0328
|
de02aa3891
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
|
2025-08-06 17:53:29 +08:00 |
|
wangna0328
|
854d311307
|
修复制度不显示问题
|
2025-08-06 17:51:42 +08:00 |
郝彬
|
0f67c55892
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
# Conflicts:
# pom.xml
|
2025-08-06 17:03:14 +08:00 |
Mr.j
|
e7d892f8a2
|
Merge remote-tracking branch 'origin/master'
|
2025-08-06 16:52:03 +08:00 |
|
郝彬
|
14ee89c4af
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
# Conflicts:
# core/src/main/java/com/dite/znpt/domain/entity/ProjectBudgetInfoEntity.java
# core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoReq.java
# core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoResp.java
# core/src/main/java/com/dite/znpt/service/impl/ProjectBudgetInfoServiceImpl.java
# core/src/main/resources/mapper/ProjectBudgetInfoMapper.xml
# web/src/main/java/com/dite/znpt/web/controller/PostController.java
|
2025-08-06 16:50:51 +08:00 |
|
wangna0328
|
39ec9a99bd
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
|
2025-08-06 16:25:08 +08:00 |
|
Mr.j
|
275cb94c02
|
完善jgq分支内容到master分支
|
2025-08-06 16:23:57 +08:00 |
|
Mr.j
|
64d40d0f84
|
Merge remote-tracking branch 'origin/jgq'
|
2025-08-06 16:08:40 +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 |
高雄
|
7034fecc0b
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
|
2025-08-06 15:15:56 +08:00 |
|
高雄
|
adc074804e
|
岗位中增加部门信息，岗位列表查询条件支持按部门（及子部门）查询
|
2025-08-06 15:14:59 +08:00 |
|
cuizhibin
|
ac23b19b0a
|
合同新增字段
|
2025-08-06 15:03:03 +08:00 |
|
wangna0328
|
8bdbbdccd5
|
项目人员调度模块前端卡片接口联调
|
2025-08-06 14:43:11 +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
|
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 |
|
Mr.j
|
8a1c5b04c5
|
优化设备请求类字段
|
2025-08-05 16:55:03 +08:00 |
|
Mr.j
|
5e21feb414
|
手动解决合并冲突
|
2025-08-05 16:44:00 +08:00 |
|
Mr.j
|
524faa18a5
|
完成设备采购需要的数据库跟新和完成分页查询功能
|
2025-08-05 16:24:31 +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 |
|
Mr.j
|
facf7a8f51
|
Revert "实现设备中心模块编辑，删除，查看详情，查看"
This reverts commit 3ebacd55c1.
|
2025-08-04 22:47:56 +08:00 |
|
Mr.j
|
3ebacd55c1
|
实现设备中心模块编辑，删除，查看详情，查看
|
2025-08-04 22:29:32 +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 |
|
高雄
|
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 |