Merge remote-tracking branch 'origin/dev-frontend_0702' into dev-frontend

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ZhiHuiYin",
-  "version": "1.1.1",
-  "description": "1、优化了抠图速度；2、升级了详情图生成速度",
+  "version": "1.2.0",
+  "description": "1、支持SmartShooter5软件控制相机",
   "main": "main.js",
   "scripts": {
     "dev": "ee-bin dev",