FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
Superman_Main
2021-11-22 22:58:57 +08:00
parent 6fb285c137 65391b493f
commit 56401bbc35
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+2 -2
View File
@@ -603,7 +603,7 @@
when 'HJ' THEN 7 when 'HJ' THEN 7
ELSE 8 ELSE 8
END, END,
sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS DECIMAL) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id 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>
<if test='page.standType != null and page.standType == "FOREIGN"'> <if test='page.standType != null and page.standType == "FOREIGN"'>
CASE sar_standards_info.stand_sort CASE sar_standards_info.stand_sort
@@ -633,7 +633,7 @@
when 'ADR' THEN 23 when 'ADR' THEN 23
ELSE 24 ELSE 24
END, END,
sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS DECIMAL) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id 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>
</sql> </sql>
<sql id="standSort_out"> <sql id="standSort_out">