From b6b77c70de21c8d109be6a9fb2d8b98d51d708e0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 23 二月 2023 02:05:21 +0800
Subject: [PATCH] 优化加入智能水电表厂家

---
 java110-bean/src/main/java/com/java110/dto/couponPropertyPool/CouponPropertyPoolDto.java |  120 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 92 insertions(+), 28 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/couponPropertyPool/CouponPropertyPoolDto.java b/java110-bean/src/main/java/com/java110/dto/couponPropertyPool/CouponPropertyPoolDto.java
index bbf6a7c..ad23976 100644
--- a/java110-bean/src/main/java/com/java110/dto/couponPropertyPool/CouponPropertyPoolDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/couponPropertyPool/CouponPropertyPoolDto.java
@@ -1,8 +1,11 @@
 package com.java110.dto.couponPropertyPool;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -14,81 +17,110 @@
  **/
 public class CouponPropertyPoolDto extends PageDto implements Serializable {
 
+    public static final String FROM_TYPE_CUSTOM = "2002";
+
+    public static final String STATE_Y = "Y";
+
     private String couponName;
-private String toType;
-private String fromType;
-private String validityDay;
-private String cppId;
-private String communityName;
-private String state;
-private String communityId;
-private String stock;
-private String fromId;
+    private String toType;
+    private String toTypeName;
+    private String fromType;
+    private String fromTypeName;
+    private String validityDay;
+    private String cppId;
+    private String communityName;
+    private String state;
+    private String communityId;
+    private String stock;
+    private String fromId;
 
 
     private Date createTime;
 
     private String statusCd = "0";
 
+    private String remark;
+
+    List<CouponPropertyPoolConfigDto> configs;
+
 
     public String getCouponName() {
         return couponName;
     }
-public void setCouponName(String couponName) {
+
+    public void setCouponName(String couponName) {
         this.couponName = couponName;
     }
-public String getToType() {
+
+    public String getToType() {
         return toType;
     }
-public void setToType(String toType) {
+
+    public void setToType(String toType) {
         this.toType = toType;
     }
-public String getFromType() {
+
+    public String getFromType() {
         return fromType;
     }
-public void setFromType(String fromType) {
+
+    public void setFromType(String fromType) {
         this.fromType = fromType;
     }
-public String getValidityDay() {
+
+    public String getValidityDay() {
         return validityDay;
     }
-public void setValidityDay(String validityDay) {
+
+    public void setValidityDay(String validityDay) {
         this.validityDay = validityDay;
     }
-public String getCppId() {
+
+    public String getCppId() {
         return cppId;
     }
-public void setCppId(String cppId) {
+
+    public void setCppId(String cppId) {
         this.cppId = cppId;
     }
-public String getCommunityName() {
+
+    public String getCommunityName() {
         return communityName;
     }
-public void setCommunityName(String communityName) {
+
+    public void setCommunityName(String communityName) {
         this.communityName = communityName;
     }
-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;
     }
-public String getStock() {
+
+    public String getStock() {
         return stock;
     }
-public void setStock(String stock) {
+
+    public void setStock(String stock) {
         this.stock = stock;
     }
-public String getFromId() {
+
+    public String getFromId() {
         return fromId;
     }
-public void setFromId(String fromId) {
+
+    public void setFromId(String fromId) {
         this.fromId = fromId;
     }
 
@@ -108,4 +140,36 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getToTypeName() {
+        return toTypeName;
+    }
+
+    public void setToTypeName(String toTypeName) {
+        this.toTypeName = toTypeName;
+    }
+
+    public String getFromTypeName() {
+        return fromTypeName;
+    }
+
+    public void setFromTypeName(String fromTypeName) {
+        this.fromTypeName = fromTypeName;
+    }
+
+    public List<CouponPropertyPoolConfigDto> getConfigs() {
+        return configs;
+    }
+
+    public void setConfigs(List<CouponPropertyPoolConfigDto> configs) {
+        this.configs = configs;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

--
Gitblit v1.8.0