From 092a98a583c4fe822a3eb4c4dac086f84b16189c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:58:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsQuery.java | 10 ++++++++--
1 files changed, 8 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 a7cc306..060d76c 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
@@ -1,18 +1,19 @@
package com.ruoyi.system.query;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
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")
@@ -25,4 +26,9 @@
@ApiModelProperty(value = "1启用 2禁用")
private Integer state;
+ @ApiModelProperty(value = "库存管理条件 不足传1")
+ private Integer type;
+
+ @ApiModelProperty(value = "供应商id/诊所id")
+ private String supplierClinicId;
}
--
Gitblit v1.7.1