Merge remote-tracking branch 'origin/master'

# Conflicts: # src/pages/procure/index.tsx

Merge remote-tracking branch 'origin/master'
# Conflicts: # src/pages/procure/index.tsx
曾国涛
2 parents fae9c639 66788e52
Showing 2 changed files with 28 additions and 27 deletions
src/pages/Order/components/AttachmentModal.tsx
src/services/definition.ts
@@ -127,6 +127,7 @@ export default ({ data, onClose }) =&gt; {
                       type="link"
                       key="key"
                       href={item.url}
+                      target="blank"
                       className="py-1"
                     >
                       下载
@@ -1381,6 +1381,32 @@ export interface Entry {
   unEmpInsuranceC?: string;
 }
  
+export interface File {
+  absolute?: boolean;
+  absoluteFile?: File;
+  absolutePath?: string;
+  canonicalFile?: File;
+  canonicalPath?: string;
+  directory?: boolean;
+  executable?: boolean;
+  file?: boolean;
+  /** @format int64 */
+  freeSpace?: number;
+  hidden?: boolean;
+  /** @format int64 */
+  lastModified?: number;
+  name?: string;
+  parent?: string;
+  parentFile?: File;
+  path?: string;
+  readable?: boolean;
+  /** @format int64 */
+  totalSpace?: number;
+  /** @format int64 */
+  usableSpace?: number;
+  writable?: boolean;
+}
+
 export interface FilePathDto {
   url?: string;
 }
@@ -3509,7 +3535,7 @@ export interface ResetPwdVO {
  
 export interface Resource {
   description?: string;
-  file?: TsgFile;
+  file?: File;
   filename?: string;
   inputStream?: InputStream;
   open?: boolean;
@@ -4035,32 +4061,6 @@ export interface CompanyInfo {
   taxIdIsNotNull?: boolean;
 }
  
-export interface TsgFile {
-  absolute?: boolean;
-  absoluteFile?: TsgFile;
-  absolutePath?: string;
-  canonicalFile?: TsgFile;
-  canonicalPath?: string;
-  directory?: boolean;
-  executable?: boolean;
-  file?: boolean;
-  /** @format int64 */
-  freeSpace?: number;
-  hidden?: boolean;
-  /** @format int64 */
-  lastModified?: number;
-  name?: string;
-  parent?: string;
-  parentFile?: TsgFile;
-  path?: string;
-  readable?: boolean;
-  /** @format int64 */
-  totalSpace?: number;
-  /** @format int64 */
-  usableSpace?: number;
-  writable?: boolean;
-}
-
 export interface InvoiceDetail {
   /** @format int64 */
   id?: number;