From fd7bc95a3c91fb7d90a921b0ff762fa6095fabd1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 06 三月 2025 17:21:00 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj

---
 cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrder.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrder.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrder.java
index 305b06d..99d9c25 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrder.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessOrder.java
@@ -60,4 +60,52 @@
 
     @ApiModelProperty("棰嗘牱鏃ユ湡")
     private LocalDate issueTime;
+
+    @ApiModelProperty("鏄惁鍚敤涓婁紶")
+    private Integer isUpload;
+
+    @ApiModelProperty("璇曟牱鍚嶇О")
+    private String sampleS;
+
+    @ApiModelProperty("濮旀墭鏃堕棿")
+    private String entrustmentTimeS;
+
+    @ApiModelProperty("鍨嬪彿")
+    private String sampleTypeS;
+
+    @ApiModelProperty("濮旀墭鍗曚綅")
+    private String companyS;
+
+    @ApiModelProperty("鐢熶骇鍗曚綅")
+    private String productionS;
+
+    @ApiModelProperty("濮旀墭浜�")
+    private String prepareUserS;
+
+    @ApiModelProperty("鏍峰搧鏁伴噺")
+    private Integer sampleNumS;
+
+    @ApiModelProperty("鏍峰搧鐘舵��")
+    private Integer insStateS;
+
+    @ApiModelProperty("鏄惁鐣欐牱")
+    private Integer isLeaveS;
+
+    @ApiModelProperty("鏍峰搧澶勭悊鏂瑰紡")
+    private Integer processingS;
+
+    @ApiModelProperty("绾﹀畾鏃堕棿")
+    private String appointedS;
+
+    @ApiModelProperty("鎶ュ憡鍙戦�佹柟寮�")
+    private Integer sendS;
+
+    @ApiModelProperty("濮旀墭浜虹鍚�")
+    private String prepareUserUrlS;
+
+    @ApiModelProperty("濮旀墭鏃ユ湡")
+    private String createTimeTwoS;
+
+    @ApiModelProperty("濮旀墭浜鸿仈绯荤數璇�")
+    private String phoneS;
 }

--
Gitblit v1.9.3