Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, buss sort See merge request LiuChao/foton-slrs-system-rest!261
2021-12-01 15:42:25 +08:00
parent 04c35a2751 c27beedaa2
commit 535a4c392d
1 changed files with 1 additions and 1 deletions
@@ -382,7 +382,7 @@
            when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16
            ELSE 17
        END,
-        tmp_tb.stand_sort ASC
+        tmp_tb.stand_sort ASC,CAST(tmp_tb.STAND_NUMBER AS decimal(9,2)) ASC,tmp_tb.STAND_YEAR DESC,tmp_tb.id
    </sql>
    <sql id="standSort_out">
        ORDER BY