Merge branch 'master' into dev-v1.1

wupengfei

1 天以前 7cf04da7eaba7cad9c3b5e5f674d2e038ebcd305

 apps/cMiniApp/.eslintrc-auto-import.json

@@ -104,6 +104,8 @@
    "watchPostEffect": true,
    "watchSyncEffect": true,
    "useUpdateResume": true,
    "useAccessReal": true
    "useAccessReal": true,
    "useLaunchOptions": true,
    "APP_ENV": true
  }
}