From c8f6f175a23e15b40309cf31850ee170d8d946ca Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 30 九月 2025 14:33:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsQuery.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsQuery.java
index 618e293..10f81ec 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsQuery.java
@@ -7,13 +7,13 @@
import lombok.Data;
@Data
-@ApiModel(value = "erp商品信息查询参数query")
+@ApiModel(value = "erp商品库存信息查询参数query")
public class TErpGoodsQuery extends BasePage {
@ApiModelProperty(value = "商品名称")
private String goodsName;
- @ApiModelProperty(value = "商品标识码")
+ @ApiModelProperty(value = "商品条码")
private String goodsIdCode;
@ApiModelProperty(value = "商品类型id")
@@ -29,6 +29,9 @@
@ApiModelProperty(value = "库存管理条件 不足传1")
private Integer type;
+ @ApiModelProperty(value = "1入库 其他不传")
+ private Integer category;
+
@ApiModelProperty(value = "供应商id/诊所id")
private String supplierClinicId;
}
--
Gitblit v1.7.1