Merge branch 'master-order' into dev

xx-order/xx-order-server/src/main/resources/mapper/OrderActiveDetailMapper.xml

@@ -6,8 +6,8 @@
       select oad.*,  bo.no as orderNo,bo.user_id, bo.goods_amount, bo.real_amount, bo.`status`, bo.crt_time as orderTime from order_active_detail oad
       LEFT JOIN base_order bo on bo.id = oad.order_id
       <where>
-          <if test="orderNo != null and orderNo != ''">
-                and bo.no = #{orderNo}
+          <if test="oneNo != null and oneNo != ''">
+                and bo.no = #{oneNo}
           </if>
           <if test="userId != null and userId > 0">
               and bo.user_id = #{userId}
@@ -21,7 +21,7 @@
           <if test="status != null and status > 0">
             and bo.status = #{status}
           </if>
-          order By bo.crt_time DESC
       </where>
+      order By bo.crt_time DESC
   </select>
 </mapper>
\ No newline at end of file