Merge branch 'develop_migration' into 'develop_master'

Develop migration See merge request LiuChao/foton-slrs-system-rest!411
2022-03-07 17:34:18 +08:00
parent 262ed6f777 69c2d4c6e2
commit 73c31e34b2
8 changed files with 277 additions and 7 deletions
@@ -863,6 +863,9 @@
            END,
            sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS decimal(9,2)) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
        </if>
+        <if test='page.standType != null and page.standType == "ALL"'>
+            sar_standards_info.stand_sort ASC
+        </if>
    </sql>
    <sql id="standSort_out">
        <if test='standType != null and standType == "INLAND"'>