From 6a9dc2c9553ae13bb3196f325c9905abbd502145 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 04 十二月 2023 16:46:00 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java
index 0ea19b1..3325f12 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java
@@ -63,9 +63,11 @@
     private Integer stata;
 
     /**
-     * 报告编号
+     * id
      */
     private String siloId;
+    //拌合站名称
+    private String siloName;
     /**
      * 报告编号
      */
@@ -74,6 +76,8 @@
      * 检验时间
      */
     private String inspectDate;
+    //1 展示 2不展示
+    private Integer types;
 
     /**
      * This field was generated by MyBatis Generator.

--
Gitblit v1.9.3