From b87d1e75d7002843536e9ddf455d9f9fa8d5e4d8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 09:57:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/model/TInventoryFrameDetail.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/model/TInventoryFrameDetail.java b/manage/src/main/java/com/jilongda/manage/model/TInventoryFrameDetail.java
index 2235f9d..2ddb66c 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TInventoryFrameDetail.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TInventoryFrameDetail.java
@@ -33,21 +33,21 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "盘点表id")
+ @ApiModelProperty(value = "盘点表id 前端忽略")
@TableField("inventoryId")
private Integer inventoryId;
@ApiModelProperty(value = "品牌")
@TableField("brand")
- private Integer brand;
+ private String brand;
@ApiModelProperty(value = "供应商")
@TableField("supplier")
- private Integer supplier;
+ private String supplier;
@ApiModelProperty(value = "材质")
@TableField("material")
- private Integer material;
+ private String material;
@ApiModelProperty(value = "库存总数量")
@TableField("total")
@@ -63,7 +63,7 @@
@ApiModelProperty(value = "镜架型号")
@TableField("model")
- private Integer model;
+ private String model;
@ApiModelProperty(value = "盘点数量")
@TableField("count")
--
Gitblit v1.7.1