Commit f3a982da3152f64700bcfc95671cbd79d2934ea4
1 parent
ba380ea6
fix：修复合并差异
Showing
1 changed file
with
1 additions
and
1 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressTemplateController.java
| @@ -73,7 +73,7 @@ public class DeliveryExpressTemplateController { | @@ -73,7 +73,7 @@ public class DeliveryExpressTemplateController { | ||
| 73 | 73 | ||
| 74 | @GetMapping("/list-all-simple") | 74 | @GetMapping("/list-all-simple") |
| 75 | @Operation(summary = "获取快递模版精简信息列表", description = "主要用于前端的下拉选项") | 75 | @Operation(summary = "获取快递模版精简信息列表", description = "主要用于前端的下拉选项") |
| 76 | - public CommonResult<List<DeliveryExpressTemplateSimpleRespVO>> getSimpleTemplateList() { | 76 | + public CommonResult<List<DeliveryExpressTemplateRespVO>> getSimpleTemplateList() { |
| 77 | // 获取运费模版列表，只要开启状态的 | 77 | // 获取运费模版列表，只要开启状态的 |
| 78 | List<DeliveryExpressTemplateDO> list = deliveryExpressTemplateService.getDeliveryExpressTemplateList(); | 78 | List<DeliveryExpressTemplateDO> list = deliveryExpressTemplateService.getDeliveryExpressTemplateList(); |
| 79 | // 排序后，返回给前端 | 79 | // 排序后，返回给前端 |