From 718ded0f5f8dd6f1da43b9de2ff20ddc12714007 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 19 九月 2025 18:47:17 +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 | 8 +++++++- 1 files changed, 7 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 a7cc306..6d97fac 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,12 +1,13 @@ 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 = "商品名称") @@ -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