From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 16:52:49 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java | 68 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
index 447f67f..3cc4ffb 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
@@ -1,5 +1,6 @@
package com.ruoyi.management.domain;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -23,8 +24,8 @@
@ApiModel(value = "SlStoreManagement对象", description = "仓库管理")
public class SlStoreManagement {
- @TableId("id")
- private Integer id;
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
@ApiModelProperty("仓库名称")
@TableField("store_management_name")
@@ -38,35 +39,60 @@
@TableField("store_management_number")
private Integer storeManagementNumber;
- @ApiModelProperty("仓库等级 1省级，2市州级，3市县级，5乡镇级，6 经营单位")
+ @ApiModelProperty("仓库等级 0全部 1省级，2市州级，3市县级，5乡镇级，6 经营单位")
@TableField("store_management_grade")
private Integer storeManagementGrade;
- @ApiModelProperty("所在市")
- @TableField("store_management_city")
- private String storeManagementCity;
+ /** 所属省名称 */
+ @TableField("province_name")
+ @ApiModelProperty("所属省名称")
+ private String provinceName;
- @ApiModelProperty("所在县")
- @TableField("store_management_county")
- private String storeManagementCounty;
+ /** 所属省code */
+ @TableField("province_code")
+ @ApiModelProperty("所属省code")
+ private String provinceCode;
- @ApiModelProperty("所在乡")
- @TableField("store_management_village")
- private String storeManagementVillage;
+ /** 城市名称 */
+ @TableField("city_name")
+ @ApiModelProperty("城市名称")
+ private String cityName;
- @ApiModelProperty("主任id-仓库管理员选择的")
+ /** 城市code */
+ @TableField("city_code")
+ private String cityCode;
+
+ /** 所属区县名称 */
+ @TableField("county_name")
+ @ApiModelProperty("所属区县名称")
+ private String countyName;
+
+ /** 所属区县code */
+ @TableField("county_code")
+ @ApiModelProperty("所属区县code")
+ private String countyCode;
+
+ /** 所属街道名称 */
+ @TableField("town_name")
+ @ApiModelProperty("所属街道名称")
+ private String townName;
+
+ /** 所属街道code */
+ @TableField("town_code")
+ @ApiModelProperty("所属街道code")
+ private String townCode;
+
+ @ApiModelProperty("主任id-仓库管理员选择的多个逗号隔各开")
@TableField("director_id")
- private Integer directorId;
+ private String directorId;
- @ApiModelProperty("主管id-仓库管理员选择的")
+ @ApiModelProperty("主管id-仓库管理员选择的多个逗号隔各开")
@TableField("competent_id")
- private Integer competentId;
+ private String competentId;
- @ApiModelProperty("主管id")
- @TableField("administrator
-_id")
- private Integer administrator
-Id;
+ @ApiModelProperty("管理员id多个逗号隔各开")
+ @TableField("administrator_id")
+ private String administratorId;
@ApiModelProperty("仓库地址")
@TableField("store_management_adder")
--
Gitblit v1.7.1