Merge remote-tracking branch 'origin/master'

cy

2023-12-02 cd146ec4e1f80c6666d7696f75c060c052145d30

 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;