Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-20 f04bb37f47ff1eb51e5e8c42d73514c1e9c33710

 ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml

@@ -50,4 +50,14 @@
        ORDER BY create_time DESC
    </select>

    <select id="pageList1" resultType="com.ruoyi.other.api.domain.TGoods">
        select * from t_goods
        <where>
            AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
        </where>
        ORDER BY
        CASE WHEN `inventory` = 0 THEN 0 ELSE 1 END DESC,
        `redeem_points` ASC;
    </select>

</mapper>