YunaiV 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java # yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java # yudao-server/src/main/resources/application-local.yaml		2023-09-28 15:18:59 +08:00
..
java	infra: 修正 查询实体列表方法，传入的ID集合为空时，会导致异常的问题	2023-09-19 17:14:42 +08:00
sql	代码生成时，前端 vue 增加组件名	2023-04-09 21:32:26 +08:00
vue	refactor: Date ==> LocalDateTime	2022-11-09 11:14:46 +08:00
vue3	会员中心：会员管理 50%	2023-08-19 14:12:03 +08:00
vue3_schema	fix: vue3 codegen PageReqVO	2023-04-25 14:50:49 +08:00
vue3_vben	fix: vben codegen	2023-09-11 13:35:00 +08:00