-
# Conflicts: # yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java # yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql # yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java # yudao-server/pom.xml
-
# Conflicts: # yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
-
Merge pull request !376 from xingyu/dev
-
# Conflicts: # yudao-dependencies/pom.xml # yudao-framework/yudao-spring-boot-starter-web/pom.xml # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
-
Merge pull request !370 from 与或非/issues/202
-
Merge pull request !363 from 与或非/issues/202
-
○ import com.baomidou.mybatisplus.IDatabaseQuery.DefaultDatabaseQuery ● import com.baomidou.mybatisplus.generator.query.DefaultQuery;
-
Merge pull request !348 from 咱哥丶/dev
-
Merge pull request !350 from kinlon92/master
-
Merge pull request !351 from xingyu/dev
-
…dule/infra/service/file/FileServiceImpl.java
-
…dule/infra/controller/admin/file/FileController.java