From 57d55bbab2ecf380af44b81884a577833f622c9a Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Mon, 15 Jul 2024 15:46:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/material/domain/MachIneDto.java     | 6 ++++++
 sgzb-ui/vue.config.js                                       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
index 197ae704..4cac6116 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
+++ b/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;
+
     /**
      * 检验人
      */
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index b9f00ef4..831d53b8 100644
--- a/sgzb-ui/vue.config.js
+++ b/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`, //福
 
         //******** 注意事项  ********* */