From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

---
 src/main/webapp/views/order/out.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index b2d3445..eccb8dc 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -146,7 +146,7 @@
     <!--            </select>-->
     <!--        </div>-->
     <!--    </div>-->
-<!--    <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button>-->
+    <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button>
 
 </script>
 
@@ -277,7 +277,7 @@
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/tools/md5.js"></script>
 <script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/order/out.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/out.js?t=1" charset="utf-8"></script>
 <!--<script type="text/template" id="takeSiteSelectTemplate">-->
 <!--    {{#each data}}-->
 <!--    <option value="{{siteId}}">{{desc}}</option>-->

--
Gitblit v1.9.1