From 7ed6489395475fc41d33914dfcc940b75ff65101 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
index 9477cdf..10132af 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html
@@ -29,7 +29,7 @@
                                 <#NameCon id="userPhone" name="下单用户手机" />
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="state" name="状态" >
+                                <#SelectCon id="state" name="订单状态" >
                                 <option value="">请选择订单状态</option>
                                 <option value="101">待接单</option>
                                 <option value="102">已接单</option>

--
Gitblit v1.7.1