From 5d43370b99a03391c9271d04d3f351f0fd734dae Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Thu, 18 Mar 2021 20:23:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java index 46cdaf9..5c511b7 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java @@ -1,7 +1,6 @@ package com.matrix.system.fenxiao.action; import com.matrix.core.pojo.AjaxResult; -import com.matrix.system.fenxiao.dto.ChangeSaleManGradeDto; import com.matrix.system.fenxiao.dto.LoadFenxiaoOrderBasicDto; import com.matrix.system.fenxiao.dto.LoadFenxiaoOrderListDto; import com.matrix.system.fenxiao.dto.LoadSetOrderListDtoDto; @@ -10,7 +9,6 @@ import com.matrix.system.fenxiao.vo.LoadFenxiaoOrderBasicVo; import com.matrix.system.fenxiao.vo.LoadFenxiaoOrderListVo; import com.matrix.system.fenxiao.vo.LoadSetOrderListDtoVo; - import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; @@ -63,7 +61,7 @@ /** * 结算记录 */ - @ApiOperation(value = "分销订单") + @ApiOperation(value = "结算记录") @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = LoadSetOrderListDtoVo.class) }) -- Gitblit v1.9.1