Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

6 天以前 c0fe393c6a5877076a7b5646b3aee01448e84a98

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

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

    <select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">