Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java

@@ -127,6 +127,12 @@ public class MachIneDto {
     @ApiModelProperty(value = "上方页面入库数量")
     private Double num;
 
+    /**
+     * 表单数量总和
+     */
+    @ApiModelProperty(value = "表单数量总和")
+    private Double totalNum;
+
     /**
      * 检验人
      */

sgzb-ui/vue.config.js

@@ -45,7 +45,7 @@ module.exports = {
         target: `http://10.40.92.60:28080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        target: `http://192.168.2.248:28080`, //帅
+        //target: `http://192.168.2.248:28080`, //帅
         // target: `http://10.40.92.253:28080`, //福
 
         //******** 注意事项  ********* */