Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!346

src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml

@@ -109,7 +109,7 @@
         AND b.is_allvisible <![CDATA[ <> ]]> 2
         WHERE a.org_code = #{org_code}  
        	
-        ORDER BY b.id DESC
+        ORDER BY a.ranks, b.ranks,b.id DESC
     </select>
     
     <update id="updateListRandsById" parameterType="list">