Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/ivt/IntoReturnMapper.xml

@@ -205,7 +205,9 @@
 
     <sql id="Condition_Response">
         <where>
+            <if test="isShowCancel == null">
              AND tpir.return_status != '退货状态-作废'
+            </if>
             <if test="returnNo != null and returnNo != ''">
                 AND tpir.return_no = #{returnNo}
             </if>

src/main/java/com/dk/mdm/model/query/ivt/IntoReturnQuery.java

@@ -279,6 +279,8 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> {
 
     private String searchText;
 
+    private String isShowCancel;
+
     private static final long serialVersionUID = 1L;
 
 }