YunaiV b69b74b770 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp ...

 Conflicts:

	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java

2022-07-04 19:56:54 +08:00

..

yudao-common

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

2022-07-04 19:56:54 +08:00

yudao-spring-boot-starter-activiti

…

yudao-spring-boot-starter-banner

…

yudao-spring-boot-starter-biz-data-permission

…

yudao-spring-boot-starter-biz-dict

…

yudao-spring-boot-starter-biz-error-code

…

yudao-spring-boot-starter-biz-operatelog

…

yudao-spring-boot-starter-biz-pay

…

yudao-spring-boot-starter-biz-sms

…

yudao-spring-boot-starter-biz-social

…

yudao-spring-boot-starter-biz-tenant

…

yudao-spring-boot-starter-biz-weixin

…

yudao-spring-boot-starter-config

…

yudao-spring-boot-starter-excel

…

yudao-spring-boot-starter-file

…

yudao-spring-boot-starter-flowable

…

yudao-spring-boot-starter-job

…

yudao-spring-boot-starter-monitor

…

yudao-spring-boot-starter-mq

…

yudao-spring-boot-starter-mybatis

…

yudao-spring-boot-starter-protection

…

yudao-spring-boot-starter-redis

…

yudao-spring-boot-starter-security

…

yudao-spring-boot-starter-test

…

yudao-spring-boot-starter-web

…

pom.xml

…