feat: merge master

bin/server.js

@@ -16,7 +16,6 @@ npm.load(() => {
     if (process.env.NODE_ENV === 'production') {
       npm.run("start"); 
     } else {
-      npm.run("ii");
       npm.run("test");
     }
   });

package-lock.json

@@ -2367,9 +2367,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.50",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.50.tgz",
-      "integrity": "sha512-eEoHobkGCDsCX7YmM+ivulbMub510F3vPCtkDUflL0UsYTLYLorC3kqJEyN8UQcxpjqI9Cav/HZCwYfnAz7Jng==",
+      "version": "0.3.52",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.52.tgz",
+      "integrity": "sha512-lxEcVFegRhLc+6N76DzgG0Ekoh0yBH0O6GAL+RmJvX5yu+TB9ufjvlKThqRUq3kH5DlUMardRc3zjxTDQGD5uw==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -26,7 +26,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.50",
+    "@qg/citrus-ui": "0.3.52",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",