Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!234
This commit is contained in:
super_liu
2021-11-13 23:12:47 +08:00
@@ -54,7 +54,7 @@
<sql id="Group_Column_List_show" >
stand_status, replaced_stand_num, replace_stand_num,put_time,
issue_time, stand_en_name, stand_name, stand_code,
issue_time, stand_en_name, stand_name, stand_code,standStatusShow,
SAR_BUSSIONESS_STAND.id
</sql>
@@ -637,7 +637,7 @@
<include refid="Base_Column_List_show" />
from SAR_BUSSIONESS_STAND
<include refid="SarBussionInfo_Where_Clause"/>
GROUP BY <include refid="Group_Column_List_show"/>
GROUP BY standStatusShow,<include refid="Group_Column_List_show"/>
) tmp_tb
<include refid="standSort_in"/>
limit ${pager.startIndex-1},${pageSize}) a