Merge branch 'master' into master-to-merge-feature

site/bisheng.config.js

@@ -134,7 +134,7 @@ module.exports = {
     if (isDev) {
       // eslint-disable-next-line
       config.devtool = 'source-map';
-      
+
       // Resolve use react hook fail when yarn link or npm link
       // https://github.com/webpack/webpack/issues/8607#issuecomment-453068938
       config.resolve.alias = { ...config.resolve.alias, react: require.resolve('react') };