From 634cea842c9a4f2ef1bddde07d7b5a334f0117de Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 十二月 2020 11:02:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'

---
 java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java |   63 ++++++++++++++++++++++---------
 1 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java b/java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java
index 9ee9202..cb951d4 100644
--- a/java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java
@@ -1,6 +1,7 @@
 package com.java110.dto.feeReceipt;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,15 @@
 public class FeeReceiptDto extends PageDto implements Serializable {
 
     private String amount;
-private String objId;
-private String remark;
-private String objName;
-private String communityId;
-private String receiptId;
-private String objType;
+    private String objId;
+    private String remark;
+    private String objName;
+    private String communityId;
+    private String receiptId;
+    private String objType;
+
+    //鍟嗘埛鍚嶇О
+    private String storeName;
 
 
     private Date createTime;
@@ -31,43 +35,56 @@
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getObjName() {
+
+    public String getObjName() {
         return objName;
     }
-public void setObjName(String objName) {
+
+    public void setObjName(String objName) {
         this.objName = objName;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getReceiptId() {
+
+    public String getReceiptId() {
         return receiptId;
     }
-public void setReceiptId(String receiptId) {
+
+    public void setReceiptId(String receiptId) {
         this.receiptId = receiptId;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
 
@@ -87,4 +104,12 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
 }

--
Gitblit v1.8.0