Merge remote-tracking branch 'origin/master'

2020-09-09 14:45:20 +08:00
parent f85819982d 7a0ccd96c7
commit 5dfecece30
3 changed files with 25 additions and 21 deletions
--- a/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanMapper.xml
@ -40,7 +40,7 @@
            <if test="createuserid != null ">and createuserid = #{createuserid}</if>
            <if test="xnxq != null  and xnxq != ''">and xnxq = #{xnxq}</if>
        </where>
-        order by month desc
+        order by month,zc desc
    </select>

    <select id="selectByThemeWeekplanById" parameterType="String" resultMap="ByThemeWeekplanResult">