郝彬
|
70db15a6fd
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-08 17:55:38 +08:00 |
Mr.j
|
4f7d53aba7
|
合并最新代码
|
2025-08-08 17:47:48 +08:00 |
|
Mr.j
|
74550c615b
|
实现申请采购推送信息到审批台出现语音提示和闪烁提示
|
2025-08-08 17:35:06 +08:00 |
|
郝彬
|
078f0699fa
|
8-8 查询项目下的设备和任务完成进度
|
2025-08-08 16:25:07 +08:00 |
|
Mr.j
|
01455720be
|
实现审批台接收到采购申请信息
|
2025-08-08 15:43:27 +08:00 |
ybb
|
231faee0d0
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
# Conflicts:
# core/pom.xml
# 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/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/impl/BusinessDataFileServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/BusinessDataServiceImpl.java
# web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java
|
2025-08-08 15:17:51 +08:00 |
|
ybb
|
3b3aa95437
|
8/7,ybb文件夹和文件都实现了记录Id功能。
|
2025-08-08 15:15:26 +08:00 |
wangna0328
|
389c8a58b0
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
|
2025-08-08 15:03:00 +08:00 |
|
wangna0328
|
d4b06d9c66
|
消除人员重复bug
|
2025-08-08 14:52:14 +08:00 |
|
Mr.j
|
91c54aaf5e
|
Merge remote-tracking branch 'origin/jgq' into development
|
2025-08-08 10:49:39 +08:00 |
|
wangna0328
|
b45766d377
|
项目人员模块代码更新
|
2025-08-08 09:17:54 +08:00 |
|
wangna0328
|
386561125e
|
项目人员模块代码更新
|
2025-08-07 18:00:40 +08:00 |
|
wangna0328
|
32d43e5a3b
|
修复 ProjectMemberController 的合并冲突并完成修改
|
2025-08-07 17:56:30 +08:00 |
|
wangna0328
|
e1259d904a
|
接口类合并冲突解决
|
2025-08-07 17:54:45 +08:00 |
|
Mr.j
|
40c11dd974
|
实现审批台的基础查询功能
|
2025-08-07 16:47:42 +08:00 |
|
ybb
|
e356368b62
|
8/7,ybb文件夹和文件都实现了记录Id功能。
|
2025-08-07 16:06:15 +08:00 |
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 |
|
cuizhibin
|
a5d5c0006d
|
回滚sip文件
|
2025-08-07 15:02:35 +08:00 |
|
Mr.j
|
c6d44f1787
|
忽略提交pom.xml，yaml文件，完成设备采购模块的新增和编辑功能
|
2025-08-07 14:35:43 +08:00 |
|
ybb
|
50659ef1a7
|
8/7,ybb文件夹和文件都实现了记录Id功能。
|
2025-08-07 11:26:02 +08:00 |
|
ybb
|
2a4ac18052
|
8/7,ybb文件夹和文件都实现了记录Id功能。
|
2025-08-07 09:50:34 +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 |
|
郝彬
|
a589422315
|
退回崔工的application-dev
|
2025-08-06 17:14:15 +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 |
|
郝彬
|
d8c76f97af
|
8-6 先commit再pull
|
2025-08-06 16:48:33 +08:00 |
|
wangna0328
|
7665cdd2e0
|
项目人员调度模块前端卡片接口联调
|
2025-08-06 16:27:15 +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 |
|
高雄
|
24d275045a
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
|
2025-08-06 14:28:33 +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 |