Merge remote-tracking branch 'origin/master'

xuhy

2025-09-03 0838f85fa74b36638adf2621bc2f49a345982dec

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

@@ -25,4 +25,7 @@
    @ApiModelProperty(value = "1启用 2禁用")
    private Integer state;

    @ApiModelProperty(value = "库存管理条件 不足传1")
    private Integer type;

}