-
Conflicts: yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
-
Merge pull request !42 from weir/oauth2
-
Merge pull request !44 from 芋道源码/feature/user-admin-server
-
Merge pull request !39 from 夜丶点缀了一个人的落寞/protection-lxm
-
Merge pull request !38 from weir/devops
-
2. 初版Jenkins文件导入
-
Merge pull request !37 from classyex/feature/source-encode
-
Merge pull request !36 from 夜丶点缀了一个人的落寞/protection-lxm
-
fix: updateUserStatus方法的注释有误