6393 Commits (e091b077a871d99c50d4e4594e1d915ccff3dc82)
 

Author SHA1 Message Date
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
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
芋道源码 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
YunaiV 8b6bc7c54e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2 years ago
芋道源码 b135314482
!890 修复:CRM 更新回款报错、待办事项中即将到期的合同查询报错、新增商机产品不显示
Merge pull request !890 from 李占宏/develop
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 91b3c16a90 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 6dcb1277b3 全局:迁移 pay 组件到 pay 模块,迁移 flowable 组件到 bpm 模块 2 years ago
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
2 years ago
YunaiV 0317e4279d 全局:简化 captcha 组件,融合到 system 模块 2 years ago
YunaiV 2dc7376ec6 全局:简化 file 组件,融合到 infra 模块 2 years ago
YunaiV 0480cdf03f 全局:简化 file 组件,融合到 infra 模块 2 years ago
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
2 years ago
YunaiV 77d634038c 全局:简化 file 组件,融合到 infra 模块 2 years ago
zhanhong b94cd08772 修复:CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭"); 2 years ago
zhanhong 89aca4572d 修复:CRM 合同配置不提醒,待办事项中即将到期的合同查询报错 2 years ago
zhanhong 8222c3a831 修复:CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId 2 years ago
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
2 years ago
YunaiV 067ff6cc4d bugfix master 的一些 pr 2 years ago
芋道源码 ccc0a09317
!877 修正注释错误
Merge pull request !877 from moon69/master
2 years ago
芋道源码 74a669f6aa
!878 修复:错误的queryWrapper构建
Merge pull request !878 from oah/fixbug
2 years ago
YunaiV d134bfc4a6 进一步同步 boot 和 cloud 代码,移除多余无用的类 2 years ago
dhb52 e4f1564ade
fix: 获取redis命令统计指令有误
Signed-off-by: dhb52 <dhb52@126.com>
2 years ago