-
Merge pull request !724 from niou233/feature/mall_product_org
-
Merge pull request !735 from 疯狂的世界/feature/mall_product
-
…-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
-
…-vue-pro into feature/mall_product # Conflicts: # yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java # yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
-
Merge pull request !696 from puhui999/feature/mall_product_tmp
-
Merge pull request !712 from 疯狂的世界/feature/mall_product
-
Merge pull request !711 from 芋道源码/feature/mq-optimize
-
Merge pull request !709 from 疯狂的世界/feature/mall_product
-
1. 拆分页面设计用的属性修改接口 2. 增加模板的页面保存 3. 增加唯一名称校验 4. 增加页面编辑器，默认选中组件判断
-
1）默认 channel 和 stream key 2）移除 enabled 开关，通过 listener 是否存在来实现 3）调整包名，为接入 rocketmq 作为 mq 实现做准备
-
Merge pull request !705 from xingyu/fix/vben_codegen
