Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4
This commit is contained in:
		| @@ -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"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user