Commit Graph

18 Commits

Author SHA1 Message Date
wyw
f2cfb723a9 [feat] 新增项目进度管理 2024-08-12 10:44:17 +08:00
wyw
8e41517755 Merge branch 'feature-merage-7.31-zqc' of https://gitee.com/hhyykk/ipms-sjy into feature-outsContract-7.26-wyw
# Conflicts:
#	yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java
#	yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractServiceImpl.java
#	yudao-server/src/main/resources/application-local.yaml
2024-08-07 10:52:21 +08:00
wyw
fff41eda04 [fix] 更新枚举类,字典 2024-08-05 10:19:26 +08:00
cputer-zqc
e0ebf5c67e Merge remote-tracking branch 'origin/feature-outsContract-7.26-wyw' into feature-merage-7.31-zqc
# Conflicts:
#	yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java
#	yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractServiceImpl.java
2024-08-05 10:06:51 +08:00
wyw
e0c60dd15b [feat] 新增枚举类 2024-08-01 15:34:47 +08:00
Qiancheng Zhao
83e39a0197 [feat]合并wyw-7.26外包合同管理模块2 2024-07-31 10:05:42 +08:00
Qiancheng Zhao
504f7f7615 [feat]合并分支 2024-07-30 09:30:17 +08:00
wyw
a224d73203 [fix] 优化合同管理,外部合同管理,外包合同管理功能 2024-07-29 12:58:16 +08:00
wyw
340358e8d1 [fix] 优化外部合同管理功能 2024-07-25 11:33:12 +08:00
wyw
b06e9b7d56 Merge branch 'feature-budge-7.23-zqc' of https://gitee.com/hhyykk/ipms-sjy into feature-contract-7.22-wyw
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
2024-07-24 13:19:20 +08:00
Qiancheng Zhao
163ac1e5de 添加pms预算管理、应收款管理两项功能的CRUD功能 2024-07-23 18:05:21 +08:00
wyw
c44b48ec3f [fix] 优化合同管理功能 2024-07-23 17:30:02 +08:00
wyw
5c4b2e1271 [feat] 新增合同管理功能 2024-07-22 17:09:10 +08:00
9e7575e9cb [feat] 增加项目与用户的关联表 2024-07-17 19:47:32 +08:00
c0e572b4b4 [feat] 1.项目信息管理增加序号自增
[fix] 1.修改附件存储数据格式
2024-07-08 20:53:09 +08:00
55e5265152 [feat] 新增项目信息管理模块业务流程表单 2024-07-07 16:00:38 +08:00
8bfc2a8ef8 [feat] 新增项目信息管理模块 2024-07-06 20:15:10 +08:00
4a407d2f8f [feat] init pms/cms module packages 2024-07-02 20:21:20 +08:00