Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsDetailMapper.xml

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unqualifiedReason != null  and unqualifiedReason != ''"> and iigd.unqualified_reason = #{unqualifiedReason}</if>
             <if test="checkPicUrls != null  and checkPicUrls != ''"> and iigd.check_pic_urls = #{checkPicUrls}</if>
         </where>
+        order by iigd.inspect_goods_detail_id
     </select>
     
     <select id="selectInspectGoodsDetailByInspectGoodsDetailId" parameterType="Long" resultMap="InspectGoodsDetailResult">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml

@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and iig.inspect_date <![CDATA[ <= ]]> #{endDateTime}
             </if>
         </where>
+        order by iig.inspect_goods_id desc
     </select>
     
     <select id="selectInspectGoodsByInspectGoodsId" parameterType="Long" resultMap="InspectGoodsResult">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml

@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unqualifiedReason != null  and unqualifiedReason != ''"> and iogd.unqualified_reason = #{unqualifiedReason}</if>
             <if test="ifAllInspect != null "> and iogd.if_all_inspect = #{ifAllInspect}</if>
         </where>
+        order by iogd.order_goods_detail_id
     </select>
     
     <select id="selectOrderGoodsDetailByOrderGoodsDetailId" parameterType="Long" resultMap="OrderGoodsDetailResult">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml

@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and iog.create_time  <![CDATA[ <= ]]> #{endDateTime}
             </if>
         </where>
+        order by iog.order_goods_id desc
     </select>
     
     <select id="selectOrderGoodsByOrderGoodsId" parameterType="Long" resultMap="OrderGoodsResult">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchaseContractDetailMapper.xml

@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="singlePrice != null "> and ipcd.single_price = #{singlePrice}</if>
             <if test="totalPrice != null "> and ipcd.total_price = #{totalPrice}</if>
         </where>
+        order by ipcd.contract_detail_id
     </select>
     
     <select id="selectPurchaseContractDetailByContractDetailId" parameterType="Long" resultMap="PurchaseContractDetailResult">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchaseContractMapper.xml

@@ -114,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and ipc.contract_end_time  <![CDATA[ <= ]]> #{endDateTime}
             </if>
         </where>
+        order by ipc.contract_id desc
     </select>
     
     <select id="selectPurchaseContractByContractId" parameterType="Long" resultMap="PurchaseContractResult">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchasePlanDetailMapper.xml

@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stallId != null "> and ippd.stall_id = #{stallId}</if>
             <if test="originalQuantity != null "> and ippd.original_quantity = #{originalQuantity}</if>
         </where>
+        order by ippd.detail_id
     </select>
     
     <select id="selectPurchasePlanDetailByDetailId" parameterType="Long" resultMap="PurchasePlanDetailResult">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchasePlanMapper.xml

@@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and ipp.purchase_date  <![CDATA[ <= ]]> #{endDateTime}
             </if>
         </where>
+        order by ipp.plan_id desc
     </select>
     
     <select id="selectPurchasePlanByPlanId" parameterType="Long" resultMap="PurchasePlanResult">