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

zss

8 天以前 8a5ac1e030826485463c078cdde03a065b45a960

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

@@ -123,7 +123,7 @@
                T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
            </if>
        </where>
        GROUP BY T1.customer_name
        GROUP BY T1.customer_name,t1.customer_id
    </select>

    <select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">