-
# 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 !320 from halfninety/feature/1.8.0-uniapp
-
2. 修复 pub/sub 未初始化的问题 3. 优化 Job 定时的 mybatis 日志输出，避免一直打印
-
Merge pull request !313 from 石溪/master
-
# Conflicts: # yudao-dependencies/pom.xml
