Merge remote-tracking branch 'origin/master'

cy

2023-11-22 b3585e6475b7a7ab38fcb8af79def5e938a297ea

 consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java

@@ -17,6 +17,7 @@
public class WhWarningQry extends ParamRequest {
    @ApiModelProperty("物品名称")
    private String goodsTemplateName;
    private String goodsTemplateId;

    @ApiModelProperty("规格型号")
    private Long baseGoodsModelsId;