BJ_ZTEITS-Developers / parking-cloud-yudao

Merge pull request !343 from xingyu/dev

Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp

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

# 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：增加地区列表界面

Merge pull request !338 from xingyu/dev

Merge pull request !337 from xingyu/dev

Merge pull request !336 from supine-win/N/A