dhb52
|
0386820a1c
|
feat: 增加[客户行业、客户来源]等字段显示，重构代码
|
2 years ago |
|
dhb52
|
f4b1e9ca4a
|
feat: MapUtils.findAndThen，key 为 null 时, 不处理
Signed-off-by: dhb52 <dhb52@126.com>
|
2 years ago |
|
dhb52
|
06c0d86544
|
fix: 使用convertSetByFlatMap避免 ID 重复
Signed-off-by: dhb52 <dhb52@126.com>
|
2 years ago |
|
dhb52
|
a23ea45632
|
fix: [CRM-客户统计]根据Code-Review 修改
|
2 years ago |
puhui999
|
ba1b028001
|
CRM：完善数据权限，实现数据权限同时添加、同时转移
|
2 years ago |
E1
|
79c51c6433
|
修复 Java21版本下docker-compose中Redis Host参数名称不正确的问题
Signed-off-by: E1 <876394202@qq.com>
|
2 years ago |
|
puhui999
|
f56fab932a
|
CRM：完善 excel 导出 review 提到的问题
|
2 years ago |
zhanhong
|
29b7106985
|
fix:包冲突 积木报表 导出Excel报错
|
2 years ago |
|
zhanhong
|
1e13365ef4
|
pom
|
2 years ago |
|
zhanhong
|
e7cc305362
|
Merge remote-tracking branch 'origin/develop' into develop
|
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
|
379bd95840
|
CRM：code review 客户分析（客户总量分析）
|
2 years ago |
|
芋道源码
|
2bf5c7a701
|
!889 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !889 from dhb52/develop
|
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
|
d3f3584132
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
835bbe7e42
|
🎉 2.0.1 版本发布！
|
2 years ago |
|
YunaiV
|
7ef7228f65
|
MALL：增加返回 vipPrice 减免金额
|
2 years ago |
|
zhanhong
|
ca7b19c40b
|
pom
|
2 years ago |
|
zhanhong
|
0bd7d310a1
|
pom
|
2 years ago |
|
zhanhong
|
7841fba59b
|
fix:积木报表导出Excel报错（包冲突）
|
2 years ago |
|
zhanhong
|
6846d429c0
|
re
|
2 years ago |
|
zhanhong
|
01695567a1
|
re
|
2 years ago |
|
zhanhong
|
a787f2a0cd
|
fix:积木报表导出Excel报错（包冲突）
|
2 years ago |
|
YunaiV
|
6b06bf8a3d
|
bugfix MALL：已过期的优惠劵，还显示可以使用
|
2 years ago |
|
YunaiV
|
f1ff656282
|
bugfix：运行失败的单测
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
|
2 years ago |
|
YunaiV
|
831cf33e95
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
|
2 years ago |
|
YunaiV
|
da6e01f6b5
|
bugfix：运行失败的单测
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
|
2 years ago |
|
YunaiV
|
bbdedd08f1
|
Merge branch 'develop' 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/redis/RedisController.java
|
2 years ago |
|
YunaiV
|
d8bfed5c87
|
fix: 获取redis命令统计指令有误
|
2 years ago |
|
YunaiV
|
8a93a4d988
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2 years ago |
|
芋道源码
|
a4c7946830
|
!887 fix: 获取redis命令统计指令有误
Merge pull request !887 from dhb52/N/A
|
2 years ago |
|
芋道源码
|
9b7f71c203
|
!896 fix:跟进记录分页不显示商机
Merge pull request !896 from 李占宏/develop
|
2 years ago |
|
zhanhong
|
814acb83ae
|
fix:跟进记录分页不显示商机
|
2 years ago |
|
YunaiV
|
257127df5b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
|
2 years ago |
|
YunaiV
|
d5aa827b86
|
!895 新增支持微信H5网页支付
|
2 years ago |
|
YunaiV
|
10cc9fa77f
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
8ff710e49d
|
✨ 同步 master 的一些 pr 代码变更
|
2 years ago |
|
芋道源码
|
18415b1a20
|
!893 解决订单同步任务引起的对已关闭的订单成功支付的问题
Merge pull request !893 from 杨宇庆/N/A
|
2 years ago |
|
芋道源码
|
24025d0c7c
|
!894 解决支付宝Wap创建的订单的超时时间无法生效的问题
Merge pull request !894 from 杨宇庆/N/A
|
2 years ago |
|
芋道源码
|
d11ca8e73f
|
!895 新增支持微信H5网页支付
Merge pull request !895 from 杨宇庆/master
|
2 years ago |
|
dhb52
|
34f68ce4c6
|
feat: CRM/数据统计/员工客户分析 初稿
|
2 years ago |
|
芋道源码
|
556e3786a8
|
!892 修补会员取消售后接口中未校验用户ID的安全漏洞
Merge pull request !892 from 杨宇庆/N/A
|
2 years ago |
|
芋道源码
|
801c405881
|
!891 修补会员退货接口中未校验用户ID的安全漏洞
Merge pull request !891 from 杨宇庆/N/A
|
2 years ago |
YangYuQing
|
7c101cacb0
|
新增支持微信H5网页支付
|
2 years ago |
|
杨宇庆
|
6f93363564
|
解决支付宝Wap创建的订单的超时时间无法生效的问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2 years ago |
|
杨宇庆
|
57715e3cff
|
解决订单同步任务引起的对已关闭的订单却能成功支付的问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2 years ago |
|
杨宇庆
|
5849f99d23
|
修补会员取消售后接口中未校验用户ID的安全漏洞
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2 years ago |
|
杨宇庆
|
9c4d373f81
|
修补会员退货接口中未校验用户ID的安全漏洞
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2 years ago |