From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java |   87 +++++++++++++++++++++++++++++++++----------
 1 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java b/java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java
index 04b9915..ee7d134 100644
--- a/java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java
@@ -1,6 +1,8 @@
 package com.java110.dto.contractChangePlan;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.contract.ContractDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,15 +14,21 @@
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class ContractChangePlanDto extends PageDto implements Serializable {
+public class ContractChangePlanDto extends ContractDto implements Serializable {
 
+    public static final String STATE_W = "11";//11 寰呭鏍� 22 瀹℃牳閫氳繃 33 瀹℃牳澶辫触
+    public static final String STATE_S = "22";//11 寰呭鏍� 22 瀹℃牳閫氳繃 33 瀹℃牳澶辫触
+    public static final String STATE_F = "33";//11 寰呭鏍� 22 瀹℃牳閫氳繃 33 瀹℃牳澶辫触
     private String planType;
-private String contractId;
-private String planId;
-private String remark;
-private String changePerson;
-private String state;
-private String storeId;
+    private String planTypeName;
+    private String contractId;
+    private String planId;
+    private String[] planIds;
+    private String remark;
+    private String changePerson;
+    private String changePersonName;
+    private String state;
+    private String storeId;
 
 
     private Date createTime;
@@ -28,46 +36,61 @@
     private String statusCd = "0";
 
 
+
+
     public String getPlanType() {
         return planType;
     }
-public void setPlanType(String planType) {
+
+    public void setPlanType(String planType) {
         this.planType = planType;
     }
-public String getContractId() {
+
+    public String getContractId() {
         return contractId;
     }
-public void setContractId(String contractId) {
+
+    public void setContractId(String contractId) {
         this.contractId = contractId;
     }
-public String getPlanId() {
+
+    public String getPlanId() {
         return planId;
     }
-public void setPlanId(String planId) {
+
+    public void setPlanId(String planId) {
         this.planId = planId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getChangePerson() {
+
+    public String getChangePerson() {
         return changePerson;
     }
-public void setChangePerson(String changePerson) {
+
+    public void setChangePerson(String changePerson) {
         this.changePerson = changePerson;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
 
@@ -87,4 +110,28 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPlanTypeName() {
+        return planTypeName;
+    }
+
+    public void setPlanTypeName(String planTypeName) {
+        this.planTypeName = planTypeName;
+    }
+
+    public String getChangePersonName() {
+        return changePersonName;
+    }
+
+    public void setChangePersonName(String changePersonName) {
+        this.changePersonName = changePersonName;
+    }
+
+    public String[] getPlanIds() {
+        return planIds;
+    }
+
+    public void setPlanIds(String[] planIds) {
+        this.planIds = planIds;
+    }
 }

--
Gitblit v1.8.0