From 92f43487ae2d2147cea2f9930ddeb61f98edb5e9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 17:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/dto/AccountDetailDTO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/dto/AccountDetailDTO.java b/manage/src/main/java/com/jilongda/manage/dto/AccountDetailDTO.java
index 697841b..47c4878 100644
--- a/manage/src/main/java/com/jilongda/manage/dto/AccountDetailDTO.java
+++ b/manage/src/main/java/com/jilongda/manage/dto/AccountDetailDTO.java
@@ -1,8 +1,6 @@
package com.jilongda.manage.dto;
-import com.jilongda.manage.model.TInventory;
-import com.jilongda.manage.model.TInventoryFrameDetail;
-import com.jilongda.manage.model.TOrderGoods;
+import com.jilongda.manage.model.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,4 +25,6 @@
private BigDecimal profitMoney;
@ApiModelProperty(value = "毛利率")
private BigDecimal profitRating;
+ @ApiModelProperty(value = "实收方式")
+ private List<TOrderItems> listItems;
}
--
Gitblit v1.7.1