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

6645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dhb52
a0b413b3a3 refactor: CRM/数据统计/排行榜 重命名 2024-02-28 21:41:53 +08:00
dhb52
7d120a2f36 feat: CRM/数据统计/客户总量分析 2024-02-28 21:41:10 +08:00
YunaiV
91b3c16a90 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-02-28 21:04:19 +08:00
YunaiV
6dcb1277b3 ✨ 全局：迁移 pay 组件到 pay 模块，迁移 flowable 组件到 bpm 模块 2024-02-28 21:03:40 +08:00
YunaiV
0dc23d38b9 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java
 2024-02-28 20:32:16 +08:00
YunaiV
0317e4279d ✨ 全局：简化 captcha 组件，融合到 system 模块 2024-02-28 20:31:55 +08:00
YunaiV
2dc7376ec6 ✨ 全局：简化 file 组件，融合到 infra 模块 2024-02-28 19:17:18 +08:00
YunaiV
0480cdf03f ✨ 全局：简化 file 组件，融合到 infra 模块 2024-02-28 19:17:00 +08:00
YunaiV
746133226f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentDAOImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/s3/S3FileClientTest.java
 2024-02-28 19:08:05 +08:00
YunaiV
77d634038c ✨ 全局：简化 file 组件，融合到 infra 模块 2024-02-28 18:59:33 +08:00
puhui999
720b54c353 CRM: 完善回款操作日志 2024-02-28 11:25:06 +08:00
zhanhong
b94cd08772 修复：CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭"); 2024-02-28 00:07:51 +08:00
puhui999
c3337f21ce fix：主子表 props 2024-02-28 00:07:25 +08:00
zhanhong
89aca4572d 修复：CRM 合同配置不提醒，待办事项中即将到期的合同查询报错 2024-02-28 00:00:23 +08:00
zhanhong
8222c3a831 修复：CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId 2024-02-27 23:51:26 +08:00
puhui999
c4ff0a1038 Merge remote-tracking branch 'yudao/develop' into develop 2024-02-27 21:28:23 +08:00
YunaiV
ece338846a Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
 2024-02-27 21:01:52 +08:00
YunaiV
067ff6cc4d ✨ bugfix master 的一些 pr 2024-02-27 21:01:02 +08:00
芋道源码
ccc0a09317
!877 修正注释错误 
Merge pull request !877 from moon69/master
 2024-02-27 12:49:13 +00:00
芋道源码
74a669f6aa
!878 修复：错误的queryWrapper构建 
Merge pull request !878 from oah/fixbug
 2024-02-27 12:42:04 +00:00
YunaiV
d134bfc4a6 ✨ 进一步同步 boot 和 cloud 代码，移除多余无用的类 2024-02-27 17:15:55 +08:00
dhb52
e4f1564ade
fix: 获取redis命令统计指令有误 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-02-27 08:22:19 +00:00
YunaiV
2aade25e78 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-02-26 23:18:03 +08:00