lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,618 Commits 2 Branches 0 Tags 165 MiB
1f93ac25b6
Commit Graph

6618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
E1
79c51c6433
修复 Java21版本下docker-compose中Redis Host参数名称不正确的问题 
Signed-off-by: E1 <876394202@qq.com>
 2024-03-03 10:26:28 +00:00
puhui999
f56fab932a CRM：完善 excel 导出 review 提到的问题 2024-03-02 23:24:42 +08:00
zhanhong
29b7106985 fix:包冲突 积木报表 导出Excel报错 2024-03-02 13:26:05 +08:00
zhanhong
1e13365ef4 pom 2024-03-02 13:23:54 +08:00
zhanhong
e7cc305362 Merge remote-tracking branch 'origin/develop' into develop 2024-03-02 13:23:05 +08:00
YunaiV
1f35ef59d1 CRM：code review excel 导出的重构 2024-03-02 00:25:51 +08:00
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
 2024-03-01 23:46:50 +08:00
YunaiV
379bd95840 CRM：code review 客户分析（客户总量分析） 2024-03-01 23:37:07 +08:00
芋道源码
2bf5c7a701
!889 feat: CRM/数据统计/员工客户分析 初稿 
Merge pull request !889 from dhb52/develop
 2024-03-01 14:21:40 +00:00
YunaiV
e091b077a8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-03-01 20:01:38 +08:00
YunaiV
dda0909843 🎉 2.0.1 版本发布！ 2024-03-01 20:01:16 +08:00
YunaiV
d3f3584132 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-03-01 19:40:52 +08:00
YunaiV
835bbe7e42 🎉 2.0.1 版本发布！ 2024-03-01 19:40:37 +08:00
YunaiV
7ef7228f65 MALL：增加返回 vipPrice 减免金额 2024-03-01 19:21:03 +08:00
zhanhong
ca7b19c40b pom 2024-03-01 19:06:24 +08:00
zhanhong
0bd7d310a1 pom 2024-03-01 19:05:54 +08:00
zhanhong
7841fba59b fix:积木报表导出Excel报错（包冲突） 2024-03-01 19:00:10 +08:00
zhanhong
6846d429c0 re 2024-03-01 18:59:49 +08:00
zhanhong
01695567a1 re 2024-03-01 18:59:11 +08:00
zhanhong
a787f2a0cd fix:积木报表导出Excel报错（包冲突） 2024-03-01 18:57:12 +08:00
YunaiV
6b06bf8a3d bugfix MALL：已过期的优惠劵，还显示可以使用 2024-03-01 13:55:37 +08:00
YunaiV
f1ff656282 bugfix：运行失败的单测 
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
 2024-03-01 12:35:00 +08:00
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
 2024-03-01 12:26:40 +08:00
YunaiV
da6e01f6b5 bugfix：运行失败的单测 
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
 2024-03-01 12:26:05 +08:00
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
 2024-03-01 09:39:55 +08:00
YunaiV
d8bfed5c87 fix: 获取redis命令统计指令有误 2024-03-01 09:39:27 +08:00
YunaiV
8a93a4d988 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-03-01 09:32:25 +08:00
芋道源码
a4c7946830
!887 fix: 获取redis命令统计指令有误 
Merge pull request !887 from dhb52/N/A
 2024-03-01 01:32:08 +00:00
芋道源码
9b7f71c203
!896 fix:跟进记录分页不显示商机 
Merge pull request !896 from 李占宏/develop
 2024-03-01 01:30:49 +00:00
zhanhong
814acb83ae fix:跟进记录分页不显示商机 2024-03-01 09:28:06 +08:00
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
 2024-03-01 09:26:04 +08:00
YunaiV
d5aa827b86 !895 新增支持微信H5网页支付 2024-03-01 09:25:47 +08:00
YunaiV
10cc9fa77f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-03-01 09:01:05 +08:00
YunaiV
8ff710e49d ✨ 同步 master 的一些 pr 代码变更 2024-03-01 09:00:43 +08:00
芋道源码
18415b1a20
!893 解决订单同步任务引起的对已关闭的订单成功支付的问题 
Merge pull request !893 from 杨宇庆/N/A
 2024-03-01 00:58:30 +00:00
芋道源码
24025d0c7c
!894 解决支付宝Wap创建的订单的超时时间无法生效的问题 
Merge pull request !894 from 杨宇庆/N/A
 2024-03-01 00:56:10 +00:00
芋道源码
d11ca8e73f
!895 新增支持微信H5网页支付 
Merge pull request !895 from 杨宇庆/master
 2024-03-01 00:51:46 +00:00
dhb52
34f68ce4c6 feat: CRM/数据统计/员工客户分析 初稿 2024-03-01 00:10:23 +08:00
芋道源码
556e3786a8
!892 修补会员取消售后接口中未校验用户ID的安全漏洞 
Merge pull request !892 from 杨宇庆/N/A
 2024-02-29 13:03:22 +00:00
芋道源码
801c405881
!891 修补会员退货接口中未校验用户ID的安全漏洞 
Merge pull request !891 from 杨宇庆/N/A
 2024-02-29 13:01:34 +00:00
YangYuQing
7c101cacb0
新增支持微信H5网页支付 2024-02-29 14:58:37 +08:00
杨宇庆
6f93363564
解决支付宝Wap创建的订单的超时时间无法生效的问题 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-02-29 06:17:33 +00:00
杨宇庆
57715e3cff
解决订单同步任务引起的对已关闭的订单却能成功支付的问题 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-02-29 05:52:39 +00:00
杨宇庆
5849f99d23
修补会员取消售后接口中未校验用户ID的安全漏洞 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-02-28 19:35:07 +00:00
杨宇庆
9c4d373f81
修补会员退货接口中未校验用户ID的安全漏洞 
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
 2024-02-28 18:23:54 +00:00
dhb52
fbb624d826 feat: CRM/数据统计/员工客户分析/客户跟进次数分析 2024-02-28 23:07:38 +08:00
YunaiV
8b6bc7c54e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-02-28 23:04:18 +08:00
芋道源码
b135314482
!890 修复：CRM 更新回款报错、待办事项中即将到期的合同查询报错、新增商机产品不显示 
Merge pull request !890 from 李占宏/develop
 2024-02-28 14:56:07 +00:00
YunaiV
c3717b68c8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-02-28 21:42:48 +08:00
YunaiV
1f4889c68e ✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter 2024-02-28 21:42:32 +08:00