From abd909b4398b5b3745497de8e0eed3545c2e7201 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Mon, 15 May 2023 17:31:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/merchant/entity/MerchantInfo.java    | 55 +++++++++++++++++++
 dax-pay/src/main/resources/logback-spring.xml |  7 +++
 2 files changed, 62 insertions(+)
 create mode 100644 dax-pay/src/main/java/cn/bootx/daxpay/core/merchant/entity/MerchantInfo.java

diff --git a/dax-pay/src/main/java/cn/bootx/daxpay/core/merchant/entity/MerchantInfo.java b/dax-pay/src/main/java/cn/bootx/daxpay/core/merchant/entity/MerchantInfo.java
new file mode 100644
index 000000000..33e18e11f
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/daxpay/core/merchant/entity/MerchantInfo.java
@@ -0,0 +1,55 @@
+package cn.bootx.daxpay.core.merchant.entity;
+
+import cn.bootx.mybatis.table.modify.annotation.DbColumn;
+import cn.bootx.mybatis.table.modify.annotation.DbTable;
+import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 商户
+ * @author xxm
+ * @date 2023/5/15
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@DbTable(comment = "商户")
+@TableName("pay_merchant")
+@Accessors(chain = true)
+public class MerchantInfo extends MpBaseEntity {
+
+    /** 商户号 */
+    @DbColumn("商户号")
+    private String mchNo;
+
+    /** 商户名称 */
+    @DbColumn("商户名称")
+    private String mchName;
+
+    /** 商户简称 */
+    @DbColumn("商户简称")
+    private String mchShortName;
+
+    /** 类型 */
+    @DbColumn("类型")
+    private String type;
+
+    /** 联系人姓名 */
+    @DbColumn("联系人姓名")
+    private String contactName;
+
+    /** 联系人手机号 */
+    @DbColumn("联系人手机号")
+    private String contactTel;
+
+    /** 是否停用 */
+    @DbColumn("是否停用")
+    private String deactivate;
+
+    /** 商户备注 */
+    @DbColumn("商户备注")
+    private String remark;
+
+}
diff --git a/dax-pay/src/main/resources/logback-spring.xml b/dax-pay/src/main/resources/logback-spring.xml
index 428bc5f47..afb342c13 100644
--- a/dax-pay/src/main/resources/logback-spring.xml
+++ b/dax-pay/src/main/resources/logback-spring.xml
@@ -11,9 +11,16 @@
     <include resource="cn/bootx/platform/common/log/logback-console.xml"/>
     <include resource="cn/bootx/platform/common/log/logback-log-file.xml"/>
 
+    <!-- plumelog Redis方式日志收集 -->
+    <appender name="plumelog" class="com.plumelog.logback.appender.LiteAppender">
+        <appName>bootx-platform</appName>
+        <plumelogHost>127</plumelogHost>
+    </appender>
+
     <!-- 开发输出级别 -->
     <root level="INFO">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfoLog"/>
     </root>
+
 </configuration>