-
Merge pull request !806 from puhui999/develop
-
Merge pull request !795 from puhui999/develop
-
Merge pull request !787 from 芋道源码/feature/mall_product
-
Merge pull request !771 from 芋道源码/feature/crm
-
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com>
-
Merge pull request !724 from niou233/feature/mall_product_org
-
…-pro into feature/mall_product_org
-
# 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