BJ_ZTEITS-Developers / parking-cloud-yudao

# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java

# Conflicts:
#	yudao-server/src/main/resources/application.yaml

# 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

2. 完成 yudao-sso-demo-by-code 的跳转 SSO 流程

Merge pull request !237 from 芋道源码/feature/visual

weixin-java-mp 更新为 最新正式版本 4.3.0

# Conflicts:
#	pom.xml