Merge remote-tracking branch 'origin/master'

石广澎

2023-12-13 6b36599c6bd372a5cce5e078c2f4e4cb9e2ee36a

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

@@ -31,7 +31,7 @@

    @ApiModelProperty("物品名称")
    private String goodsTemplateName;
    private String goodsTemplateId;
    private Long goodsTemplateId;

    @ApiModelProperty("分类")
    private Long categoryId;