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/shopVipAccount/ShopVipAccountDto.java |   74 +++++++++++++++++++++++++++---------
 1 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/shopVipAccount/ShopVipAccountDto.java b/java110-bean/src/main/java/com/java110/dto/shopVipAccount/ShopVipAccountDto.java
index e165c77..949b745 100644
--- a/java110-bean/src/main/java/com/java110/dto/shopVipAccount/ShopVipAccountDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/shopVipAccount/ShopVipAccountDto.java
@@ -1,6 +1,7 @@
 package com.java110.dto.shopVipAccount;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,13 +15,26 @@
  **/
 public class ShopVipAccountDto extends PageDto implements Serializable {
 
+
+    /**
+     * 2003	鐜伴噾璐︽埛
+     * 2004	绉垎璐︽埛
+     * 2005	浼樻儬鍒歌处鎴�
+     * 2006	閲戝竵璐︽埛
+     */
+    public static final String ACCT_TYPE_CASH = "2003";
+    public static final String ACCT_TYPE_INTEGRAL = "2004";
+    public static final String ACCT_TYPE_COUPON = "2005";
+    public static final String ACCT_TYPE_GOLD = "2006";
+
     private String amount;
-private String vipAcctId;
-private String vipId;
-private String acctType;
-private String shopId;
-private String acctName;
-private String storeId;
+    private String vipAcctId;
+    private String vipId;
+    private String acctType;
+    private String acctTypeName;
+    private String shopId;
+    private String acctName;
+    private String storeId;
 
 
     private Date createTime;
@@ -31,43 +45,56 @@
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getVipAcctId() {
+
+    public String getVipAcctId() {
         return vipAcctId;
     }
-public void setVipAcctId(String vipAcctId) {
+
+    public void setVipAcctId(String vipAcctId) {
         this.vipAcctId = vipAcctId;
     }
-public String getVipId() {
+
+    public String getVipId() {
         return vipId;
     }
-public void setVipId(String vipId) {
+
+    public void setVipId(String vipId) {
         this.vipId = vipId;
     }
-public String getAcctType() {
+
+    public String getAcctType() {
         return acctType;
     }
-public void setAcctType(String acctType) {
+
+    public void setAcctType(String acctType) {
         this.acctType = acctType;
     }
-public String getShopId() {
+
+    public String getShopId() {
         return shopId;
     }
-public void setShopId(String shopId) {
+
+    public void setShopId(String shopId) {
         this.shopId = shopId;
     }
-public String getAcctName() {
+
+    public String getAcctName() {
         return acctName;
     }
-public void setAcctName(String acctName) {
+
+    public void setAcctName(String acctName) {
         this.acctName = acctName;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
 
@@ -87,4 +114,13 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getAcctTypeName() {
+        return acctTypeName;
+    }
+
+    public void setAcctTypeName(String acctTypeName) {
+        this.acctTypeName = acctTypeName;
+    }
+
 }

--
Gitblit v1.8.0