YunaiV
|
f73cb540cf
|
✨ MALL：去除分销提现的银行配置
|
2 years ago |
puhui999
|
a1c17b9b00
|
CRM-客户：日志表达式调整
|
2 years ago |
owen
|
9203f485e9
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
|
2 years ago |
|
puhui999
|
d8bb55fc0b
|
CRM-客户：完善操作日志
|
2 years ago |
|
YunaiV
|
3091a0882f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
ee250c74d6
|
✨ MALL：更新 uni-app + Vue3 实现
|
2 years ago |
|
puhui999
|
ea4b4b8956
|
CRM-客户：精简 VO
|
2 years ago |
|
puhui999
|
e6f4c1f0d5
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
YunaiV
|
a974d055b6
|
📖 CRM：【还款】code review 还款的代码，补全对应的 todo list
|
2 years ago |
|
YunaiV
|
c6a9751511
|
📖 CRM：【合同】code review 合同的代码，补全对应的 todo list
|
2 years ago |
|
YunaiV
|
2668e0cfeb
|
📖 CRM：【产品】code review 产品的代码，补全对应的 todo list
|
2 years ago |
|
YunaiV
|
b9f1e8ffaf
|
📖 CRM：【联系人】code review 商机的代码，补全对应的 todo list
|
2 years ago |
杨宇庆
|
9e895c8af1
|
修复订单操作日志中快递公司名称模板与数据对不上的问题
cn.iocoder.yudao.module.trade.enums.order.TradeOrderOperateTypeEnum中ADMIN_DELIVERY为deliveryName
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2 years ago |
|
YunaiV
|
02324f9e60
|
✨ CRM：【联系人】统一字段
|
2 years ago |
|
YunaiV
|
cff6e520ee
|
📖 CRM：【联系人】code review 联系人的代码，补全对应的 todo list
|
2 years ago |
|
YunaiV
|
f8f5e525be
|
✨ CRM：新增跟进记录表
|
2 years ago |
|
YunaiV
|
2e7c3e09a9
|
📖 CRM：code review 所有代码，补充对应 todo
|
2 years ago |
|
YunaiV
|
d0df0e8e16
|
📖 CRM：【客户】优化锁定客户的逻辑实现
|
2 years ago |
|
puhui999
|
e18ac461ea
|
fix: 修复公众号模块，当粉丝第一次关注的时候会出现错误（公众号粉丝不存在）
|
2 years ago |
|
puhui999
|
90bdc1fd83
|
fix: 修复公众号统计接口字符串日期转 localDateTime 报错的问题
|
2 years ago |
|
YunaiV
|
0253846fdf
|
Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
|
2 years ago |
|
YunaiV
|
1da8006af3
|
📖 CRM：【客户】完善列表、新增、修改接口的 todo
|
2 years ago |
|
YunaiV
|
9e3055ee1e
|
📖 CRM：code review 商机模块
|
2 years ago |
yunlongn
|
39d26cc84d
|
会员当前有等级的时候下订单会把当前等级清空得bug修复
|
2 years ago |
|
YunaiV
|
2d0537387b
|
Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
|
2 years ago |
|
YunaiV
|
8c9b483ac5
|
📖 code review 操作日志的实现
|
2 years ago |
|
芋道源码
|
9c3cf1d6b6
|
!806 操作日志：完善 code review 提到的问题
Merge pull request !806 from puhui999/develop
|
2 years ago |
|
YunaiV
|
290f45dd6e
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-server/src/main/resources/application-local.yaml
|
2 years ago |
|
YunaiV
|
6c0978407b
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2 years ago |
|
YunaiV
|
8a947990f4
|
🐛 升级 easyexcel 依赖，解决 JDK21 导出报错
|
2 years ago |
|
YunaiV
|
a98d00a7fe
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
2fb36563ec
|
🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递
|
2 years ago |
|
YunaiV
|
81c726542b
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
51968c4c19
|
🐛 腾讯云上传 bug
|
2 years ago |
|
YunaiV
|
e35b8c45a0
|
🐛 REPORT：支持 SaaS 租户模式
|
2 years ago |
|
YunaiV
|
baabebb5d1
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java
# yudao-server/src/main/resources/application-dev.yaml
# yudao-server/src/main/resources/application-local.yaml
|
2 years ago |
|
YunaiV
|
078ead536b
|
🐛 REPORT：支持 SaaS 租户模式
|
2 years ago |
|
YunaiV
|
be0e0f5d71
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
9a03f1a796
|
🐛 BPM：多租户的工作流隔离
|
2 years ago |
|
YunaiV
|
2ede505987
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2 years ago |
|
YunaiV
|
c48e0b9f48
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
芋道源码
|
b5e19c63f7
|
!799 解决审批流自定义脚本无法获取流程变量
Merge pull request !799 from xiuuuu/master-jdk21
|
2 years ago |
|
YunaiV
|
c38790655f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
d31a12aff7
|
🐛 修改了支付 demo 退款单匹配错误问题
|
2 years ago |
|
芋道源码
|
8dc56cc3f5
|
!800 修改了支付demo退款单匹配错误问题
Merge pull request !800 from lynfgn/master
|
2 years ago |
|
芋道源码
|
53a64272b9
|
!804 代码生成器Vue2，Excel导出下载修复
Merge pull request !804 from virtuecai/master
|
2 years ago |
|
YunaiV
|
b0857aedbc
|
🐛 修复 ExcelUtils 报错
|
2 years ago |
|
YunaiV
|
f0fd0c6677
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
|
2 years ago |
|
YunaiV
|
8de2eea1f7
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
ed1b55fed7
|
🐛 文件路径 url 中文解码问题
|
2 years ago |