From c3e4a95cc4ada32b0ac7f14fcd5469bd1bbd1c09 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 六月 2024 09:53:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
index 5abd147..42eb682 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
@@ -25,13 +26,13 @@
private String model;
@ValueTableShow(value = 5, name = "鏍峰搧鏁伴噺")
- private Integer num = 1;
+ private Integer num;
@ValueTableShow(value = 6, name = "鎬讳环")
private BigDecimal price;
@ValueTableShow(value = 7, name = "璇曢獙椤圭洰")
- private String product;
+ private String inspectionItem;
@ValueTableShow(value = 8, name = "濮旀墭鍗曚綅")
private String company;
@@ -41,4 +42,14 @@
private Integer createUser;
+ private Integer insSampleId;
+
+ private Double cost;//宸ユ椂
+
+ @TableField(exist = false,select = false)
+ private String dates;
+
+ public Integer getNum() {
+ return num = 1;
+ }
}
--
Gitblit v1.9.3