Merge branch 'master' into dev-v1.1

wupengfei

12 小时以前 ce7ff0effee22807c8d29a31d6f5f2713d3bf95c

 .eslintrc-auto-import.json

@@ -44,11 +44,11 @@
    "EnumEnterpriseWalletAccess": true,
    "EnumEnterpriseWalletExpandindirectOrderFileType": true,
    "EnumEnterpriseWalletExpandindirectOrderScene": true,
    "EnumEnterpriseWalletExpandindirectOrderSceneText": true,
    "EnumEnterpriseWalletExpandindirectOrderStatus": true,
    "EnumEnterpriseWalletExpandindirectOrderStatusText": true,
    "EnumEnterpriseWalletSignStatus": true,
    "EnumEnterpriseWalletSignStatusText": true,
    "EnumEnterpriseWalletTransactionStatus": true,
    "EnumEnterpriseWalletTransactionType": true,
    "EnumMenuType": true,
    "EnumMenuVisitLevel": true,
@@ -97,6 +97,8 @@
    "EnumUserStatus": true,
    "EnumUserType": true,
    "EnumUserTypeText": true,
    "EnumUserWalletTransactionType": true,
    "EnumWalletTransactionStatus": true,
    "ExtractDefaultPropTypes": true,
    "ExtractPropTypes": true,
    "ExtractPublicPropTypes": true,