From a07cbc9c54891faef8c356ff1ac53a4b71b28271 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 06 九月 2023 17:03:52 +0800
Subject: [PATCH] #甲方单位必填

---
 src/main/java/com/zy/crm/manager/entity/Order.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/Order.java b/src/main/java/com/zy/crm/manager/entity/Order.java
index 218df66..2104193 100644
--- a/src/main/java/com/zy/crm/manager/entity/Order.java
+++ b/src/main/java/com/zy/crm/manager/entity/Order.java
@@ -138,9 +138,9 @@
     private String files;
 
     /**
-     * 鐘舵�� 1: 姝e父  0: 绂佺敤
+     * 椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}
      */
-    @ApiModelProperty(value= "鐘舵�� 1: 姝e父  0: 绂佺敤  ")
+    @ApiModelProperty(value= "椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}")
     private Integer status;
 
     /**
@@ -173,6 +173,12 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+
+    @ApiModelProperty(value= "椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}")
+    @TableField("step")
+    private int step;
+
+
     /**
      * 娉ㄩ噴
      */
@@ -181,7 +187,7 @@
 
     public Order() {}
 
-    public Order(Long hostId,Long deptId,Long userId,Long cstmrId,String uuid,String name,Double money,Long company,String remarks,Long director,String province,String city,String district,String town,String addr,String files,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public Order(Long hostId,Long deptId,Long userId,Long cstmrId,String uuid,String name,Double money,Long company,String remarks,Long director,String province,String city,String district,String town,String addr,String files,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,Integer step,String memo) {
         this.hostId = hostId;
         this.deptId = deptId;
         this.userId = userId;
@@ -203,6 +209,7 @@
         this.createTime = createTime;
         this.updateBy = updateBy;
         this.updateTime = updateTime;
+        this.step = step;
         this.memo = memo;
     }
 
@@ -288,10 +295,12 @@
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){
-            case 1:
-                return "姝e父";
             case 0:
-                return "绂佺敤";
+                return "璺熻釜涓�";
+            case 1:
+                return "瀹屾垚";
+            case 2:
+                return "鍏抽棴";
             default:
                 return String.valueOf(this.status);
         }

--
Gitblit v1.9.1