chenyuan
|
4362ce444b
|
merge 1216
|
1 year ago |
YunaiV
|
b44eab7f93
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
|
2 years ago |
|
YunaiV
|
d556b29214
|
CRM：code review 权限的优化
|
2 years ago |
puhui999
|
af5fbb6ff4
|
CRM: TransferReqVO bizId -> id、修复商机转移错误
|
2 years ago |
|
YunaiV
|
89fc83c419
|
CRM：code review 客户权限的实现
|
2 years ago |
|
puhui999
|
f56fab932a
|
CRM：完善 excel 导出 review 提到的问题
|
2 years ago |
|
YunaiV
|
1f35ef59d1
|
CRM：code review excel 导出的重构
|
2 years ago |
|
YunaiV
|
fc7734319b
|
Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
|
2 years ago |
|
YunaiV
|
e091b077a8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
dda0909843
|
🎉 2.0.1 版本发布！
|
2 years ago |
|
YunaiV
|
c3717b68c8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
1f4889c68e
|
✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter
|
2 years ago |
|
YunaiV
|
02466aca2e
|
✨ 2.0.1 版本发布准备
|
2 years ago |
|
puhui999
|
462a4ee823
|
重构 excel 导入模版下拉生成逻辑使用字段注解的方式配置下拉选择
|
2 years ago |
|
YunaiV
|
cd87f2e4aa
|
✨ CRM：code review 客户导出的实现
|
2 years ago |
|
puhui999
|
5dc1dbb3b2
|
完善 Excel 导入模版下拉选择生成实现
|
2 years ago |
|
YunaiV
|
e53a0ca884
|
✨ CRM：code review 客户导入
|
2 years ago |
|
puhui999
|
41b8575b8d
|
CRM：完善客户导入
|
2 years ago |
|
puhui999
|
b26eb6266f
|
CRM：新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
|
2 years ago |
|
YunaiV
|
475e932aec
|
🐛 导出 Excel:Long 类型 ID 会丢失精度
|
2 years ago |
|
YunaiV
|
98697ee075
|
⬆️
|
2 years ago |
|
YunaiV
|
b84da30234
|
mall + pay：
1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型，将 refund status 合并进去
|
3 years ago |
xingyu
|
14594e492e
|
update: springboot 2.6.8 ==> 2.6.9
|
4 years ago |
|
YunaiV
|
d3200910db
|
基于 Guava 实现 dict 字典数据的本地缓存
|
4 years ago |
Jelly
|
5e43efc555
|
fix:修复 Maven 构建一些提示
|
4 years ago |
|
YunaiV
|
0439a5505a
|
初始化数据字典
|
4 years ago |
|
YunaiV
|
a927dd059e
|
项目结构调整 x 18 : 解决拆分后的报错
|
5 years ago |
|
YunaiV
|
eec8d12b70
|
项目结构调整 x 17 : 解决拆分后的报错
|
5 years ago |
|
YunaiV
|
cf4eeab395
|
项目结构调整 x 16 : 将 monitor、sms、dict 等组件拆分出去
|
5 years ago |