-
# 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
-
秒杀活动新增，修改，删除时对秒杀时段的秒杀活动数量进行修改
-
Merge pull request !307 from plimlips/N/A
