Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

10 小时以前 1cf91e355038837f30f2d727507b2229263d7de7

 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml

@@ -154,7 +154,7 @@
        select
            p.product_name as product_category,
            pm.model as specification_model,
            pm.id
            pm.id as product_model_id
        from product_model pm
        left join product p on pm.product_id = p.id
    </select>