java/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2025-11-04 08:06:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix：修复合并差异

Browse Source
This commit is contained in:
puhui999
2023-06-03 21:12:12 +08:00
parent ba380ea615
commit f3a982da31
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressTemplateController.java
View File

@ -73,7 +73,7 @@ public class DeliveryExpressTemplateController {
@GetMapping("/list-all-simple") @GetMapping("/list-all-simple")
@Operation(summary = "获取快递模版精简信息列表", description = "主要用于前端的下拉选项") @Operation(summary = "获取快递模版精简信息列表", description = "主要用于前端的下拉选项")
public CommonResult<List<DeliveryExpressTemplateSimpleRespVO>> getSimpleTemplateList() { public CommonResult<List<DeliveryExpressTemplateRespVO>> getSimpleTemplateList() {
// 获取运费模版列表，只要开启状态的 // 获取运费模版列表，只要开启状态的
List<DeliveryExpressTemplateDO> list = deliveryExpressTemplateService.getDeliveryExpressTemplateList(); List<DeliveryExpressTemplateDO> list = deliveryExpressTemplateService.getDeliveryExpressTemplateList();
// 排序后，返回给前端 // 排序后，返回给前端