xingyu
|
e1b92c3d64
|
chore: up springboot 2.7.15
|
2 years ago |
YunaiV
|
2bbd86e25d
|
优化 README 说明
|
2 years ago |
|
YunaiV
|
5a940b1d2c
|
修复 knife4j get 参数无法正确展示的问题
|
2 years ago |
|
YunaiV
|
a5e33f6d3a
|
引入 mybatis plus join 作为基类
|
2 years ago |
|
YunaiV
|
65d7b30011
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
55f8585ea8
|
同步
|
2 years ago |
|
芋道源码
|
fcf8ec98a0
|
!608 Date转localDateTime
Merge pull request !608 from GamePlayer-Joker/master
|
2 years ago |
|
芋道源码
|
5719b7df06
|
!612 使用下划线分隔ErrorCodeConstants的ErrorCode
Merge pull request !612 from dhb52/master
|
2 years ago |
|
芋道源码
|
5d4a750dfb
|
!609 ID列存在换行符造成SQL Server建库时列名异常，并造成后续相关命令执行失败
Merge pull request !609 from samisgod/master
|
2 years ago |
|
YunaiV
|
7bf21fb02d
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2 years ago |
|
芋道源码
|
57d2b7e3be
|
Merge pull request #342 from Lemon-cc-hang/social
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
|
2 years ago |
dhb52
|
d7488e70b0
|
使用下划线分割ErrorCodeConstants的ErrorCode
|
2 years ago |
lemoncc
|
2fd201c7fa
|
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
|
2 years ago |
samisgod
|
a4d6d5e6c3
|
fix db creation error
|
2 years ago |
|
YunaiV
|
b3d3efc8c4
|
升级 springdoc、knife4j 版本
|
2 years ago |
GamePlayer-Joker
|
1bf182c341
|
补充
Signed-off-by: GamePlayer-Joker <13317488+gameplayer-joker@user.noreply.gitee.com>
|
2 years ago |
|
GamePlayer-Joker
|
76a8fb8a0a
|
AppCombinationRecordRespVO中的expireTime过期时间是LocalDateTime, 现在用的是new Date()
|
2 years ago |
|
YunaiV
|
fcca69d243
|
修复 revision 在 Maven install、deploy 时，不替换为版本号的问题
|
2 years ago |
|
zhijiantianya@gmail.com
|
beb385aab4
|
修复 revision 在 Maven install、deploy 时，不替换为版本号的问题
|
2 years ago |
|
YunaiV
|
36b3cfafd2
|
同步 v1.8.1 SQL 脚本
|
2 years ago |
|
YunaiV
|
5308e309ea
|
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files
|
2 years ago |
|
YunaiV
|
379c143dbb
|
修复：#320 支付手续费计算不正确，超过付款金额 #334
|
2 years ago |
|
YunaiV
|
a532ba0579
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2 years ago |
|
芋道源码
|
05fc322919
|
Merge pull request #334 from freesme/fix-master-#320-calculation-error
修复：#320 支付手续费计算不正确，超过付款金额
|
2 years ago |
|
芋道源码
|
0cb7d8a29a
|
Merge pull request #335 from freesme/master-fix-#330wx-mini-jump-failed
修复：微信公众号菜单添加跳转小程序失败
|
2 years ago |
|
YunaiV
|
4db3de8d86
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2 years ago |
|
芋道源码
|
a1f6826e14
|
Merge pull request #337 from freesme/fix-master-#319-wx-pay-client-error
修复：#319 微信支付初始化 client 客户端错误，导致发起支付报错
|
2 years ago |
|
YunaiV
|
4809e9b462
|
修复单元测试报错的问题
|
2 years ago |
|
YunaiV
|
8f86f65884
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
482a84a6f1
|
603 mall: 优惠券退还优化
|
2 years ago |
|
芋道源码
|
670f2ef5da
|
!603 mall: 优惠券退还优化
Merge pull request !603 from 疯狂的世界/mall_order_cancel
|
2 years ago |
|
芋道源码
|
8321d14b0b
|
!599 Crontab组件radio的label类型不一致
Merge pull request !599 from 高小牛/master
|
2 years ago |
|
YunaiV
|
b69d4e0852
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
芋道源码
|
80a5889757
|
!565 vben代码生成模版
Merge pull request !565 from xingyu/feature/vben_codegen
|
2 years ago |
|
芋道源码
|
7870283bfa
|
!594 兼容spring web 配置上下文根路径的情况
Merge pull request !594 from suyh/master
|
2 years ago |
|
芋道源码
|
e67b62f2f6
|
!604 优惠券优化
Merge pull request !604 from 疯狂的世界/coupon
|
2 years ago |
|
YunaiV
|
9148170926
|
调整 mapper 命名，避免可能的冲突
|
2 years ago |
owen
|
71efa0ed6f
|
promotion: 订单使用品类券时，根据品类过滤可用商品
|
2 years ago |
|
owen
|
8bbaaf1ce9
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
2 years ago |
|
owen
|
6a7be19d3a
|
common: 增加InEnumCollectionValidator，用于校验枚举值列表参数的取值范围是否有䇅
|
2 years ago |
|
owen
|
11ad7ad5e4
|
mall: 优惠券退还优化
|
2 years ago |
|
YunaiV
|
c25bf38f50
|
code review：交易订单的取消
|
2 years ago |
|
YunaiV
|
9c0d0c809a
|
Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2 years ago |
|
YunaiV
|
68c1113ed1
|
code review：优惠劵发放
|
2 years ago |
|
YunaiV
|
a6ec3fefcf
|
code review：优惠劵发放
|
2 years ago |
|
芋道源码
|
c06d3c3d26
|
!602 mall: 发送优惠券功能优化
Merge pull request !602 from 疯狂的世界/mall_coupon_take
|
2 years ago |
|
owen
|
3fbce643ee
|
mall: 发送优惠券功能优化
|
2 years ago |
|
YunaiV
|
76f510f247
|
code review：优惠劵发放
|
2 years ago |
|
owen
|
b3fcefa677
|
trade: 会员取消订单
|
2 years ago |
|
芋道源码
|
af0771a175
|
!597 优惠券
Merge pull request !597 from 疯狂的世界/owen_dev
|
2 years ago |