-
# Conflicts: # pom.xml # sql/mysql/ruoyi-vue-pro.sql # yudao-dependencies/pom.xml # yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java # yudao-server/pom.xml # yudao-server/src/main/resources/admin-ui/static/js/4.js # yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js # yudao-server/src/main/resources/application-local.yaml # yudao-ui-admin/yarn.lock
-
Merge pull request !332 from 与或非/issues/I5RFO2
-
Merge pull request !344 from plimlips/N/A
-
Merge pull request !341 from 王添翼/master
-
Merge pull request !326 from Ikko Ashimine/N/A
ssXXX）`-
后台一直使用 0 作为成功，所以前端也不应该使用200 Signed-off-by: plimlips <156839224@qq.com>
-
Merge pull request !343 from xingyu/dev
-
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
-
修改注释中的错别字“ // 获用户门列表，只要开启状态的”改为“ // 获取用户列表，只要开启状态的” Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
-
Merge pull request !329 from 骑士梦/master
-
Merge pull request !340 from 王添翼/master
-
// ========== OAuth2 授权 1002022000 ========= ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1002022000, "code 不存在"); ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1002022000, "code 已过期"); 二者错误码重复，现将OAUTH2_CODE_EXPIRE的错误码改为1002022001。 Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
-
Merge pull request !339 from xingyu/dev