mirror of
https://gitee.com/huangge1199_admin/vue-pro.git
synced 2024-11-27 01:32:03 +08:00
fix:修复合并差异
This commit is contained in:
parent
ba380ea615
commit
f3a982da31
@ -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();
|
||||||
// 排序后,返回给前端
|
// 排序后,返回给前端
|
||||||
|
Loading…
Reference in New Issue
Block a user