From d93356927d8a0a5a91963c28d461d9107562d759 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 30 May 2025 17:38:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin'
---
oying-system/src/main/java/com/oying/modules/system/domain/Merchants.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/Merchants.java b/oying-system/src/main/java/com/oying/modules/system/domain/Merchants.java
new file mode 100644
index 0000000..139f7b5
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/Merchants.java
@@ -0,0 +1,68 @@
+package com.oying.modules.system.domain;
+
+import com.oying.base.BaseEntity;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import java.sql.Timestamp;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+* @description /
+* @author lixin
+* @date 2025-05-29
+**/
+@Getter
+@Setter
+@TableName("sys_merchants")
+public class Merchants extends BaseEntity implements Serializable {
+
+ @TableId(value = "merchants_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "ID")
+ private Long merchantsId;
+
+ @NotBlank
+ @ApiModelProperty(value = "名称")
+ private String merchantName;
+
+ @NotBlank
+ @ApiModelProperty(value = "商户编码")
+ private String merchantCode;
+
+ @NotBlank
+ @ApiModelProperty(value = "营业执照号")
+ private String businessLicense;
+
+ @NotBlank
+ @ApiModelProperty(value = "营业执照号路径")
+ private String businessLicensePath;
+
+ @NotBlank
+ @ApiModelProperty(value = "联系手机")
+ private String contactMobile;
+
+ @ApiModelProperty(value = "排序")
+ private Integer merchantsSort;
+
+ @ApiModelProperty(value = "状态")
+ private String enabled = "1";
+
+ @ApiModelProperty(value = "审核人")
+ private String authUser;
+
+ @ApiModelProperty(value = "审核时间")
+ private Timestamp authTime;
+
+ @ApiModelProperty(value = "审核信息")
+ private String authMessage;
+
+ public void copy(Merchants source){
+ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ }
+}
--
Gitblit v1.9.3