From d90ac211d9168c1ce8d390838f367a0db00afb52 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 六月 2025 14:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Franchisee.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Franchisee.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Franchisee.java
index 1542e0a..4b0799b 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Franchisee.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Franchisee.java
@@ -9,9 +9,11 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.apache.poi.hpsf.Decimal;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
/**
* <p>
@@ -27,7 +29,7 @@
@ApiModel(value = "Franchisee对象", description = "加盟商信息表")
public class Franchisee extends BaseEntity {
- @TableId(value = "id",type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("加盟商名称")
@@ -58,12 +60,10 @@
@ApiModelProperty("管理员密码")
@TableField("admin_password")
- @NotBlank(message = "请输入:管理员密码")
private String adminPassword;
@ApiModelProperty("管辖城市( ',' 隔开)")
@TableField("city")
- @NotBlank(message = "请选择:管辖城市")
private String city;
@ApiModelProperty("身份证正反面照片 ,隔开")
@@ -79,4 +79,21 @@
@TableField("is_enable")
private Integer isEnable;
+ @ApiModelProperty("管辖城市二维数组")
+ @TableField("city_str")
+ private String cityStr;
+
+ @ApiModelProperty("对应城市code")
+ @NotBlank(message = "请选择:管辖城市")
+ @TableField("city_code")
+ private String cityCode;
+
+ @ApiModelProperty("管辖城市二维数组")
+ @TableField("site_ids")
+ private String siteIds;
+ @ApiModelProperty("余额")
+ @TableField("balance")
+ private BigDecimal balance;
+ @TableField(exist = false)
+ private String siteStr;
}
--
Gitblit v1.7.1