From 4c679e03c2c5f64f4ff38656ca3ee95fa3acd7e9 Mon Sep 17 00:00:00 2001
From: 19991905653 <jing121710>
Date: Fri, 23 Feb 2024 17:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=93=B6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/entity/MerchantCashPlace.java    | 41 +++++--------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlace.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlace.java
index fd30c48..89e4455 100644
--- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlace.java
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlace.java
@@ -41,11 +41,6 @@ public class MerchantCashPlace implements Serializable {
     @TableField("userId")
     private Long userId;
 
-    /**
-     * 多商户的关联code
-     */
-    private String bindingCode;
-
     /**
      * 收银点名称
      */
@@ -62,6 +57,8 @@ public class MerchantCashPlace implements Serializable {
      */
     @TableField("address")
     private String address;
+    @TableField("bindingCode")
+    private String bindingCode;
 
 
     /**
@@ -72,8 +69,14 @@ public class MerchantCashPlace implements Serializable {
 
     @TableField(exist = false)
     private String merchantCode;
-
-
+    @TableField("root_account_id")
+    private long rootAccountId;
+    @TableField("pay_passage_id")
+    private long payPassageId;
+    @TableField("pay_passage_name")
+    private String payPassageName;
+    @TableField(exist = false)
+    private Integer tab;
     /**
      * 创建时间
      */
@@ -81,18 +84,6 @@ public class MerchantCashPlace implements Serializable {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    /**
-     * 创建时间 开始时间
-     */
-    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
-    private Date createTimeStart;
-
-    /**
-     * 创建时间 截止时间
-     */
-    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
-    private Date createTimeEnd;
-
     /**
      * 更新时间
      */
@@ -100,16 +91,4 @@ public class MerchantCashPlace implements Serializable {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    /**
-     * 更新时间 开始时间
-     */
-    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
-    private Date updateTimeStart;
-
-    /**
-     * 更新时间 截止时间
-     */
-    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
-    private Date updateTimeEnd;
-
 }
\ No newline at end of file