From bdfb519e59d7119dcf5835a4b6ebd6c4d2006470 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 16 十二月 2019 18:33:13 +0800
Subject: [PATCH] 合并代码

---
 WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
index d8c9fa2..86ab93d 100644
--- a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
+++ b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
@@ -107,6 +107,13 @@
                                        class="form-control">
                             </div>
                         </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">璁惧璁块棶url</label>
+                            <div class="col-sm-10">
+                                <input v-model="editMachineInfo.machineUrl" readonly type="text" placeholder="閫夊~锛岃濉啓璁惧MAC"
+                                       class="form-control">
+                            </div>
+                        </div>
 
                         <div class="ibox-content">
                             <button class="btn btn-primary float-right" type="button" v-on:click="editMachine()"><i

--
Gitblit v1.8.0