From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/itemRelease/ItemReleaseDto.java |  131 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/itemRelease/ItemReleaseDto.java b/java110-bean/src/main/java/com/java110/dto/itemRelease/ItemReleaseDto.java
index 36ae5f8..2dd8ebc 100644
--- a/java110-bean/src/main/java/com/java110/dto/itemRelease/ItemReleaseDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/itemRelease/ItemReleaseDto.java
@@ -1,6 +1,8 @@
 package com.java110.dto.itemRelease;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.itemReleaseType.ItemReleaseTypeDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,23 +14,35 @@
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class ItemReleaseDto extends PageDto implements Serializable {
+public class ItemReleaseDto extends ItemReleaseTypeDto implements Serializable {
+
+    //鐘舵�� W寰呭鏍� D 瀹℃牳涓� C 瀹℃牳瀹屾垚 D 瀹℃牳澶辫触
+    public static final String STATE_WAIT = "W"; //W寰呭鏍�
+    public static final String STATE_DOING = "D"; //瀹℃牳涓�
+    public static final String STATE_COMPLETE = "C"; //瀹℃牳瀹屾垚
+    public static final String STATE_FAIT = "F"; //瀹℃牳澶辫触
+
 
     private String amount;
-private String applyCompany;
-private String idCard;
-private String passTime;
-private String carNum;
-private String remark;
-private String applyPerson;
-private String irId;
-private String applyTel;
-private String typeId;
-private String state;
-private String communityId;
+    private String applyCompany;
+    private String idCard;
+    private String passTime;
+    private String carNum;
+    private String remark;
+    private String applyPerson;
+    private String irId;
+    private String[] irIds;
+    private String applyTel;
+    private String typeId;
+    private String state;
+    private String communityId;
+
+    private String stateName;
 
 
     private Date createTime;
+
+    private String createUserId;
 
     private String statusCd = "0";
 
@@ -36,73 +50,96 @@
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getApplyCompany() {
+
+    public String getApplyCompany() {
         return applyCompany;
     }
-public void setApplyCompany(String applyCompany) {
+
+    public void setApplyCompany(String applyCompany) {
         this.applyCompany = applyCompany;
     }
-public String getIdCard() {
+
+    public String getIdCard() {
         return idCard;
     }
-public void setIdCard(String idCard) {
+
+    public void setIdCard(String idCard) {
         this.idCard = idCard;
     }
-public String getPassTime() {
+
+    public String getPassTime() {
         return passTime;
     }
-public void setPassTime(String passTime) {
+
+    public void setPassTime(String passTime) {
         this.passTime = passTime;
     }
-public String getCarNum() {
+
+    public String getCarNum() {
         return carNum;
     }
-public void setCarNum(String carNum) {
+
+    public void setCarNum(String carNum) {
         this.carNum = carNum;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getApplyPerson() {
+
+    public String getApplyPerson() {
         return applyPerson;
     }
-public void setApplyPerson(String applyPerson) {
+
+    public void setApplyPerson(String applyPerson) {
         this.applyPerson = applyPerson;
     }
-public String getIrId() {
+
+    public String getIrId() {
         return irId;
     }
-public void setIrId(String irId) {
+
+    public void setIrId(String irId) {
         this.irId = irId;
     }
-public String getApplyTel() {
+
+    public String getApplyTel() {
         return applyTel;
     }
-public void setApplyTel(String applyTel) {
+
+    public void setApplyTel(String applyTel) {
         this.applyTel = applyTel;
     }
-public String getTypeId() {
+
+    public String getTypeId() {
         return typeId;
     }
-public void setTypeId(String typeId) {
+
+    public void setTypeId(String typeId) {
         this.typeId = typeId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -122,4 +159,28 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String[] getIrIds() {
+        return irIds;
+    }
+
+    public void setIrIds(String[] irIds) {
+        this.irIds = irIds;
+    }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
 }

--
Gitblit v1.8.0