-
…-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 !709 from 疯狂的世界/feature/mall_product
-
1. 拆分页面设计用的属性修改接口 2. 增加模板的页面保存 3. 增加唯一名称校验 4. 增加页面编辑器,默认选中组件判断
-
Merge pull request !703 from 疯狂的世界/feature/mall_diy
-
Merge pull request !694 from puhui999/feature/mall_product
-
Merge pull request !685 from puhui999/feature/mall_product
-
Merge pull request !683 from zxiaoxiu/discount