You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
YunaiV 787de1be94 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	sql/mysql/mall.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
2 years ago
..
yudao-module-product-api product:优化代码实现,简化重复判空 2 years ago
yudao-module-product-biz Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
yudao-module-promotion-api Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2 years ago
yudao-module-promotion-biz Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2 years ago
yudao-module-statistics-api code review:商城统计 2 years ago
yudao-module-statistics-biz pay:微调 enum 的包名 2 years ago
yudao-module-trade-api code review:订单统计 2 years ago
yudao-module-trade-biz 1.8.3 版本发布 2 years ago
pom.xml 商城:增加 stat 统计设计 2 years ago