-
# Conflicts: # sql/mysql/ruoyi-vue-pro.sql # yudao-ui-admin/src/utils/dict.js
-
Merge pull request !376 from xingyu/dev
-
# Conflicts: # yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java
-
Merge pull request !341 from 王添翼/master
-
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
-
修改注释中的错别字“ // 获用户门列表，只要开启状态的”改为“ // 获取用户列表，只要开启状态的” Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
-
// ========== 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>
-
# Conflicts: # yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java # yudao-module-system/yudao-module-system-biz/pom.xml
-
# Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java # yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java # yudao-ui-admin/src/views/mall/trade/order/index.vue
-
area：增加地区列表界面
