From 3695eb9fa6062ef00e685835cf384c02e60f7b17 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 20 十二月 2024 13:39:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

---
 src/main/webapp/views/basDevp/basDevp_detail.html |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/views/basDevp/basDevp_detail.html b/src/main/webapp/views/basDevp/basDevp_detail.html
index afaa743..fc38e31 100644
--- a/src/main/webapp/views/basDevp/basDevp_detail.html
+++ b/src/main/webapp/views/basDevp/basDevp_detail.html
@@ -30,12 +30,12 @@
             </div>
         </div>
 
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">澶囥��銆�娉細</label>
-            <div class="layui-input-inline">
-                <input id="devMk" class="layui-input" type="text">
-            </div>
-        </div>
+<!--        <div class="layui-inline"  style="width:31%;display: none">-->
+<!--            <label class="layui-form-label">澶囥��銆�娉細</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--                <input id="devMk" class="layui-input" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="layui-inline"  style="width:31%;">
             <label class="layui-form-label">鍙��銆�鍏ワ細</label>
             <div class="layui-input-inline">
@@ -234,10 +234,16 @@
                 <input id="cartPos" class="layui-input" type="text">
             </div>
         </div>
+<!--        <div class="layui-inline"  style="width:31%;">-->
+<!--            <label class="layui-form-label">璁惧鎻忚堪锛�</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--                <input id="decDesc" class="layui-input" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="layui-inline"  style="width:31%;">
-            <label class="layui-form-label">璁惧鎻忚堪锛�</label>
+            <label class="layui-form-label">绔欑偣鍑哄叆鐘舵��</label>
             <div class="layui-input-inline">
-                <input id="decDesc" class="layui-input" type="text">
+                <input id="devMk" class="layui-input" type="text">
             </div>
         </div>
 

--
Gitblit v1.9.1