Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

5 天以前 f8d30932873605f5eb407228b22a38ec5ff96af9

 ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsQuery.java

@@ -1,5 +1,6 @@
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;
@@ -28,5 +29,6 @@
    @ApiModelProperty(value = "库存管理条件 不足传1")
    private Integer type;


    @ApiModelProperty(value = "供应商id/诊所id")
    private String supplierClinicId;
}