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

Compare commits

base: CaiXiang:cbc3983714cc97c504e65eeb8e60f92185fcff91
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:802a5474e7a3d6ca8231409d0531c8332f4c0512
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "cbc3983714cc97c504e65eeb8e60f92185fcff91" and "802a5474e7a3d6ca8231409d0531c8332f4c0512" have entirely different histories.
cbc3983714 ... 802a5474e7

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">