From f3cba59fc471e42936a10d8e923fd097e80cbc97 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 10:12:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 916339b..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")
@@ -44,14 +45,17 @@
/** 所属省名称 */
@TableField("province_name")
+ @ApiModelProperty("所属省名称")
private String provinceName;
/** 所属省code */
@TableField("province_code")
+ @ApiModelProperty("所属省code")
private String provinceCode;
/** 城市名称 */
@TableField("city_name")
+ @ApiModelProperty("城市名称")
private String cityName;
/** 城市code */
@@ -60,18 +64,22 @@
/** 所属区县名称 */
@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-仓库管理员选择的多个逗号隔各开")
--
Gitblit v1.7.1