From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有

---
 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
index 750ee10..cb779c8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -1,5 +1,6 @@
 package com.yuanchu.mom.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yuanchu.mom.annotation.ValueTableShow;
 import com.yuanchu.mom.pojo.InsOrder;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,19 +14,21 @@
 @Data
 public class SampleOrderDto extends InsOrder {
 
-    @ValueTableShow(5)
     @ApiModelProperty("妫�楠屽璞�")
     private String sampleType;
 
-    @ValueTableShow(6)
+    @ValueTableShow(3)
     @ApiModelProperty("鏍峰搧鍚嶇О")
     private String sampleName;
 
-    @ValueTableShow(6)
+    @ValueTableShow(4)
     @ApiModelProperty("鏍峰搧鍨嬪彿")
     private String sampleModel;
 
-    @ValueTableShow(6)
+    @ValueTableShow(5)
+    @ApiModelProperty("鏍峰搧鏁伴噺")
+    private Integer sampleNum;
+
     @ApiModelProperty("鏍峰搧缂栧彿")
     private String sampleCode;
 
@@ -36,4 +39,11 @@
     @ApiModelProperty("鎶ュ憡id")
     private String reportId;
 
+    @TableField("`url`")
+    private String url;
+
+    private String urlS;
+
+    private String name;
+
 }

--
Gitblit v1.9.3