CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CaiXiang:b0e88370b1d90ea24b0b346db3265fbee9572ef1
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:3172934f4eff74bb77d14409f46819b3a38f59d0
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "b0e88370b1d90ea24b0b346db3265fbee9572ef1" and "3172934f4eff74bb77d14409f46819b3a38f59d0" have entirely different histories.
b0e88370b1 ... 3172934f4e

1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

4
ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
View File

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