Merge remote-tracking branch 'origin/master'

cy

2023-12-09 15fd776a22e816144f24e3281d92559fcd55e2c0

 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;