yanyang #31

Merged
yanyang merged 2 commits from yanyang into master 2023-04-03 10:41:32 +08:00
Showing only changes of commit 0eb650ff50 - Show all commits

View File

@ -140,7 +140,7 @@
</if>
AND twpbs.valid = 1
</where>
order by twpb.CREATE_TIME desc
order by twpb.CREATE_TIME desc, twpbs.PACKAGING_BOX_ID asc, twpbs.SLOT asc
</select>
<select id="substratePage" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
@ -161,7 +161,7 @@
</if>
AND twpbs.valid = 1
</where>
order by twpb.CREATE_TIME desc
order by twpb.CREATE_TIME desc, twpbs.PACKAGING_BOX_ID asc, twpbs.SLOT asc
</select>
<select id="subIdPage" resultMap="ResultMap">