Merge branch 'dev' into test

api-admin/src/main/java/com/glxp/sale/admin/constant/BasicExportTypeEnum.java

@@ -52,10 +52,6 @@ public enum BasicExportTypeEnum {
      */
 //    IO_ORDER("io_order", "单据信息"),
 
-    /**
-     * 发票信息
-     */
-//    ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),
 
     /**
      * 发票信息

api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java

@@ -263,6 +263,10 @@ public class DlAllDataService {
         switch (exportType){
             case IO_ORDER:
             case COUNTRY_DI_DATA:
+            case SYS_SET_DATA:
+            case DOCUMENT_TYPE_DATA:
+            case USER_DATA:
+            case THIRD_DATA:
                 return;
         }