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 |
|
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 |
高雄
|
adc074804e
|
岗位中增加部门信息，岗位列表查询条件支持按部门（及子部门）查询
|
2025-08-06 15:14:59 +08:00 |
|
郝彬
|
dbbd3922f9
|
8-6 取消预算单同步删除数据库的使用记录，并撤回预算消费，创建项目时自动计算总预算
|
2025-08-06 14:30:30 +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 |
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
|
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
|
ffbf766cee
|
1.手动批量上传文件夹图像到项目(单张)
|
2025-08-05 20:24:55 +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 |
|
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 |
|
Mr.j
|
d3e0851413
|
Revert "制度模块按需求修改完成，且通过测试"
This reverts commit 258806b499.
|
2025-08-04 19:35:00 +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 |
|
ybb
|
944681f334
|
7-31 岗位查用户
|
2025-08-04 16:10: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
|
023455be47
|
实现设备中心模块数据库设计以及设备分页查询功能
|
2025-08-01 09:42:08 +08:00 |
|
wangna0328
|
78c23c019c
|
制度模块按需求修改完成，且通过测试
|
2025-07-31 15:04:46 +08:00 |
|
郝彬
|
9723dc0390
|
7-31 删除角色或岗位或角色时，同时删除对应关联表，优化后续查询效率及外键不存在问题
|
2025-07-31 10:41:01 +08:00 |
|
wangna0328
|
72af3aa203
|
增加制度类型管理页面，相关方法已通过测试
|
2025-07-30 16:17:42 +08:00 |
|
Mr.j
|
4b46233805
|
实现培训计划查询
|
2025-07-30 09:43:29 +08:00 |
|
wangna0328
|
641266e549
|
移除讨论功能
|
2025-07-30 09:24:22 +08:00 |
|
wangna0328
|
d10cd352b0
|
移除制度模块中与投票相关的方法并修改相关逻辑
|
2025-07-29 20:11:46 +08:00 |
|
wangna0328
|
2b94b8846b
|
移除制度模块中与投票相关的方法
|
2025-07-29 19:44:34 +08:00 |
|
郝彬
|
4ac2b4314c
|
7-29-根据角色查询用户
|
2025-07-29 09:09:57 +08:00 |
|
wangna0328
|
8ab365fc8b
|
制度相关功能后端开发
|
2025-07-28 16:33:21 +08:00 |