From 87c1e76403b09b137ad07abd75350a4b4cc23694 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 28 九月 2025 16:22:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsQuery.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 6d97fac..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
@@ -13,7 +13,7 @@
@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