Merge remote-tracking branch 'origin/master'

cy

2023-11-22 b3585e6475b7a7ab38fcb8af79def5e938a297ea

 consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java

@@ -50,6 +50,10 @@
            sql.append(" AND goods.GOODS_TEMPLATE_NAME like :goodsTemplateName");
            paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
        }
        if (param.getGoodsTemplateId() != null) {
            sql.append(" AND goods.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
            paramts.put("goodsTemplateId", param.getGoodsTemplateId());
        }
        //分类
        if (param.getCategoryId() != null) {
            sql.append(" AND goodsTemp.CATEGORY_ID=:categoryId");