Qiancheng Zhao
|
7446e57a48
|
Merge remote-tracking branch 'origin/feature-extContract-7.25-wyw' into feature-merage-7.26-zqc
# Conflicts:
# yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java
# yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontract/ExtContractServiceImpl.java
|
2024-07-31 09:29:10 +08:00 |
|
Qiancheng Zhao
|
982f817f4c
|
Merge remote-tracking branch 'origin/feature-contract-7.22-wyw' into feature-merage-7.26-zqc
|
2024-07-30 14:33:46 +08:00 |
|
Qiancheng Zhao
|
504f7f7615
|
[feat]合并分支
|
2024-07-30 09:30:17 +08:00 |
|
wyw
|
73d09ffea0
|
[fix] 修复外部合同管理模块，增加校验
|
2024-07-26 11:34:20 +08:00 |
|
wyw
|
871ddf4aab
|
[fix] 修复外部合同管理模块，增加校验
|
2024-07-26 11:15:31 +08:00 |
|
wyw
|
47adca8394
|
[fix] 修复合同管理模块，增加校验
|
2024-07-26 11:10:59 +08:00 |
|
wyw
|
171c0cc018
|
Merge branch 'feature-budge-7.23-zqc' of https://gitee.com/hhyykk/ipms-sjy into feature-extContract-7.25-wyw
# Conflicts:
# yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java
|
2024-07-26 10:26:00 +08:00 |
|
wyw
|
9d82236a89
|
[feat] 新增外部合同管理功能，之前提交到了7.22分支中
|
2024-07-26 10:25:01 +08:00 |
|
wyw
|
7ec73544f6
|
[feat] 新增历史合同管理功能
|
2024-07-26 10:20:33 +08:00 |
|
Qiancheng Zhao
|
dafc8cb432
|
Merge remote-tracking branch 'origin/feature-extContract-7.25-wyw' into feature-merage-7.26-zqc
# Conflicts:
# yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java
|
2024-07-26 09:46:54 +08:00 |
|
Qiancheng Zhao
|
05b6707709
|
[feat]添加博爱错信息，添加注释信息
|
2024-07-26 09:46:18 +08:00 |
|
wyw
|
b0ff4a7666
|
[fix] 更新ui
|
2024-07-25 17:06:00 +08:00 |
|
wyw
|
7003b2a5eb
|
[fix] 优化历史合同管理功能
|
2024-07-25 16:57:26 +08:00 |
|
wyw
|
64c9b06f91
|
[feat] 新增历史合同管理功能
|
2024-07-25 16:31:59 +08:00 |
|
wyw
|
e721f62821
|
[fix] 重新提交外前端ui
|
2024-07-25 16:26:02 +08:00 |
|
wyw
|
591d5bc495
|
[fix] 优化外部合同管理功能
|
2024-07-25 14:42:42 +08:00 |
|
Qiancheng Zhao
|
99a33c9c41
|
Merge branch 'feature-contract-7.22-wyw' into feature-budge-7.23-zqc
# Conflicts:
# yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java
|
2024-07-25 12:05:42 +08:00 |
|
wyw
|
340358e8d1
|
[fix] 优化外部合同管理功能
|
2024-07-25 11:33:12 +08:00 |
|
wyw
|
ee17a3935c
|
Merge branch 'feature-budge-7.23-zqc' of https://gitee.com/hhyykk/ipms-sjy into feature-contract-7.22-wyw
# Conflicts:
# yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java
|
2024-07-25 10:51:04 +08:00 |
|
wyw
|
8886aa269d
|
[feat] 新增外部合同管理功能
|
2024-07-24 16:25:20 +08:00 |
|
wyw
|
f0dc469105
|
[feat] 新增外部合同管理功能
|
2024-07-24 16:22:04 +08:00 |
|
Qiancheng Zhao
|
4a4d150fdc
|
添加PMS中预算管理、应收款管理的前端页面及sql语句部分；添加CMS中，外包合同部分，后端代码，前端代码及sql语句
|
2024-07-24 15:21:21 +08:00 |
|
wyw
|
967a83948b
|
[fix] 优化合同管理功能
|
2024-07-24 13:35:44 +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 |
|
wyw
|
c46f14c630
|
[fix] 优化合同管理功能
|
2024-07-24 13:18:37 +08:00 |
|
wyw
|
57b1000fc5
|
[fix] 优化合同管理功能
|
2024-07-24 11:02:40 +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 |
|
|
|
391dd0fe83
|
[fix] 移除无用的测试
|
2024-07-18 10:24:12 +08:00 |
|
|
|
36c71a5372
|
[fix] 移除无用的测试
|
2024-07-18 10:23:56 +08:00 |
|
|
|
14175c5018
|
Merge branch 'gitee-master-jdk17' into feature-project
# Conflicts:
# README.md
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
# yudao-server/pom.xml
# yudao-server/src/main/resources/application-dev.yaml
|
2024-07-18 10:01:15 +08:00 |
|
|
|
8215f6d641
|
[fix] 修改说明
|
2024-07-18 09:20:05 +08:00 |
|
|
|
2050a6ab45
|
[fix] 修改说明
|
2024-07-18 09:14:44 +08:00 |
|
|
|
489801409c
|
[fix] 代码整理
|
2024-07-18 09:08:12 +08:00 |
|
|
|
0f67d1edde
|
[fix] 代码整理
|
2024-07-18 09:05:38 +08:00 |
|
|
|
c1eb26a7aa
|
[feat] 增加项目与用户的关联表
|
2024-07-18 09:01:28 +08:00 |
|
|
|
f78bb5202d
|
[feat] 增加项目与用户的关联表
|
2024-07-17 19:51:16 +08:00 |
|
|
|
9e7575e9cb
|
[feat] 增加项目与用户的关联表
|
2024-07-17 19:47:32 +08:00 |
|
YunaiV
|
6330353938
|
【依赖】更新 README 中的框架版本号
|
2024-07-17 19:35:22 +08:00 |
|
|
|
f32dd75760
|
[fix] 修改属性更新策略
|
2024-07-16 14:21:28 +08:00 |
|
YunaiV
|
38d5013da8
|
【依赖】maven-compiler-plugin from 3.11.0 to 3.13.0
【依赖】flatten-maven-plugin from 1.5.0 to 1.6.0
|
2024-07-16 12:32:50 +08:00 |
|
YunaiV
|
28d74d07ac
|
【代码优化】调整 swagger 的安全配置
|
2024-07-16 00:30:54 +08:00 |
|
YunaiV
|
c64ba58cd0
|
【依赖】knife4j from 4.3.0 to 4.5.0
|
2024-07-16 00:01:24 +08:00 |
|
YunaiV
|
968009cb5e
|
【依赖】redisson from 3.26.0 to 3.32.0
|
2024-07-15 22:30:17 +08:00 |
|
|
|
705f915efe
|
[fix] 修改文件管理归档
|
2024-07-15 21:17:13 +08:00 |
|
|
|
2b29b12235
|
[fix] 文件管理
|
2024-07-15 18:15:51 +08:00 |
|
YunaiV
|
4de27eb12d
|
【依赖】easy-trans from 1.6.6 to 1.7.8
|
2024-07-15 12:38:23 +08:00 |
|
YunaiV
|
211e196fce
|
【依赖】jimureport from 1.6.6 to 1.7.8
|
2024-07-14 21:57:52 +08:00 |
|
YunaiV
|
bea66e5c6f
|
【代码优化】全局：复用 MyBatis Plus 数据权限插件，简化项目的数据权限实现
|
2024-07-13 23:35:39 +08:00 |
|
