Merge remote-tracking branch 'origin/test' into test

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -785,6 +785,7 @@
         </if>
 
         <where>
+
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
             </if>
@@ -816,6 +817,8 @@
             <if test="orderQueryVo.userId != null and orderQueryVo.userId != ''">
                 and io.userid = #{orderQueryVo.userId}
             </if>
+            and (io.del_flag IS NULL
+            or io.del_flag = 1)
         </where>
         group by io.orderno
         <if test="orderQueryVo.orderStatus != null and orderQueryVo.orderStatus == 3">