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

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -627,6 +627,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
      */
     @Pagination
     public ResponseResultVO<PageList<OutboundResponse>> selectByCond(OutboundQuery outboundQuery) {
+        outboundQuery.setOutType(Constant.OutType.SALE.getName());
         return super.mergeListWithCount(outboundQuery, outboundMapper.selectByCond(outboundQuery),
                 outboundMapper.countByCond(outboundQuery));
     }

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -615,6 +615,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
      */
     @Pagination
     public ResponseResultVO<PageList<OutboundResponse>> selectByCond(OutboundQuery outboundQuery) {
+        outboundQuery.setOutType(Constant.OutType.SALE_RETURN.getName());
         return super.mergeListWithCount(outboundQuery, outboundMapper.selectByCond(outboundQuery),
                 outboundMapper.countByCond(outboundQuery));
     }