处理冲突

package.json

@@ -55,11 +55,7 @@
     "gulp": "^4.0.2",
     "http-proxy-middleware": "^1.0.5",
     "json2ts": "^0.0.7",
-<<<<<<< HEAD
-    "ora": "^4.0.4"
-=======
     "ora": "^4.0.4",
     "typescript": "^3.9.7"
->>>>>>> e9e3714b8dc4dc712b9e6ecc39e1d59cde20bb12
   }
 }

src/global/config/global.d.ts

-export interface MemberType {
-	id: number;
-	typeName: string;
-}
-
-export interface BusinessType {
-	id: number;
-	typeName: string;
-}
-
-export interface UseType {
-	memberType: MemberType[];
-	businessType: BusinessType[];
-}
-
-export interface UserRegister {
-	useType: UseType;
-	useDetail?: any;
-}
-
-export interface RuleConfiguration {
-	value: number;
-	label: string;
-	platformType: number;
-}
-
-export interface PayWayResponse {
-	payType: number;
-	value: number;
-	label: string;
-}
-
-export interface PayInitializeConfig {
-	payType: number;
-	ruleConfigurations: RuleConfiguration[];
-	payWayResponses: PayWayResponse[];
-}
-
-export interface PayPlatformPayConfig {
-	id: number;
-	payType: number;
-	way: string;
-	isPitchOn: number;
-}
-
-export interface PayConfig {
-	payInitializeConfig: PayInitializeConfig[];
-	payPlatformPayConfig: PayPlatformPayConfig[];
-}
-
-export interface CountryList {
-	name: string;
-	key: string;
-	icon: string;
-}
-
-export interface Children {
-	code: string;
-}
-
-export interface MenuList {
-	code: string;
-	children: Children[];
-}
-
-export interface Global {
-	logo: string;
-	countryList: CountryList[];
-	menuList: MenuList[];
-}
-
-export interface RootObject {
-	userRegister: UserRegister;
-	payConfig: PayConfig;
-	global: Global;
-}
\ No newline at end of file

src/hooks/useRowSelectionTable.ts

@@ -57,19 +57,11 @@ export const useRowSelectionTable = (options: useRowSelectionOptions = {}): [Tab
     onSelect: (record, selects, selectedRows, nativeEvent) => {
       if (type === 'radio') {
         // 单选情况下
-<<<<<<< HEAD
-        setSelectedRowKeys([record[customKey]])
-        setSelectRow([record])
-        return ;
-      }
-      const findIds = selectedRowKeys.indexOf(record[customKey])
-=======
         setSelectedRowKeys([record.id])
         setSelectRow([record])
         return ;
       }
       const findIds = selectedRowKeys.indexOf(record.id)
->>>>>>> e9e3714b8dc4dc712b9e6ecc39e1d59cde20bb12
       if (findIds === -1) {
         mergeRowKeys(record[customKey])
         mergeRow(record)