Merge remote-tracking branch 'origin/master'

xyc

2024-09-13 dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc

 modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml

@@ -39,7 +39,7 @@
                and ${whereSql}
            </if>
        </where>
            ORDER BY is_default,product_type,id
            ORDER BY is_default desc,product_type,id
    </select>
    <select id="getDefaultImg" resultType="com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase">
        select a.name, a.id