Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/constants/index.ts

@@ -18,3 +18,5 @@ export const Environment_Status = {
   3: "APP"
 }
 
+// 1是阿里云oss服务器, 2是本地文件服务器
+export const UPLOAD_TYPE = isDev ? 2 : 1
\ No newline at end of file

src/pages/trademark/addBrand.tsx

@@ -14,6 +14,7 @@ import {
 import { UploadFile, UploadChangeParam } from 'antd/lib/upload/interface';
 import ReutrnEle from '@/components/ReturnEle'
 import { PublicApi } from '@/services/api'
+import { UPLOAD_TYPE } from '@/constants'
 
 const { Step } = Steps;