From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06:14 +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/SlVolumeProductionZy.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZy.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZy.java
index 14238fa..fe07e93 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZy.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZy.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,16 +24,20 @@
@ApiModel(value = "SlVolumeProductionZy对象", description = "发起转移")
public class SlVolumeProductionZy {
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
+
+ @ApiModelProperty("发起人ID")
+ @TableField("sys_id")
+ private Long sysId;
@ApiModelProperty("物资id")
@TableField("materials_id")
- private Integer materialsId;
+ private Long materialsId;
- @ApiModelProperty("入库数量")
+ @ApiModelProperty("入库")
@TableField("rk_id")
- private Integer rkId;
+ private Long rkId;
@ApiModelProperty("转移数量")
@TableField("zy_num")
@@ -78,13 +83,11 @@
@TableField("state")
private Integer state;
- @ApiModelProperty("归还数量")
- @TableField("guih_num")
- private Integer guihNum;
+ @ApiModelProperty("转移管理id")
+ private Long zyglId;
- @ApiModelProperty("是否匹配 1未匹配，已匹配")
- @TableField("type")
- private String type;
+ @ApiModelProperty("转移管理新生成入库编号")
+ private Long scrkId;
}
--
Gitblit v1.7.1