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

liyong

昨天 33f9eae4ad4321860e4881f5f38dad6368c878ef

 src/main/resources/mapper/basic/SupplierManageMapper.xml

@@ -35,6 +35,7 @@
                AND T1.is_white = #{supplierManageDto.isWhite}
            </if>
        </where>
        order by T1.id desc
    </select>

    <select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">
@@ -106,6 +107,7 @@
                AND sm.supplier_name LIKE CONCAT('%',#{supplierName},'%')
            </if>
        </where>
        order by T1.supplier_id desc
    </select>
    <select id="supplierTransactionsDetails"
            resultType="com.ruoyi.purchase.vo.SupplierTransactionsDetailsVo">
@@ -157,6 +159,7 @@
           group by pl.id
       )T3 on T3.id = pl.id
       where pl.supplier_id = #{supplierId}
       order by pl.id desc
    </select>

</mapper>