-
Merge pull request !606 from 疯狂的世界/brokerage
-
Merge pull request !569 from 天天写BUG/master
-
# Conflicts: # sql/mysql/member_level.sql # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
-
# Conflicts: # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
-
Merge pull request !577 from 疯狂的世界/member_dev
-
1.会员设置标签
-
1.增加会员标签功能
-
Merge pull request !560 from QingX/feature/mall_product
-
fix:修复创建新租户，由于data_scope_dept_ids设置的是 not null 但是是空值时候产生错误，插入失败 Signed-off-by: 天天写BUG <decan_zheng@foxmail.com>
-
infra_codegen_table表增加front_type字段 member_user表部分字段增加默认值 system_menu表permission增加默认值
-
2. 同步最新 SQL 文件