confict

Helius

2021-02-03 fed1f885b03a5b4b7c62d44320c3ff2068ca02e6

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html

@@ -55,11 +55,11 @@
   
   <div class="form-group">
       
         <label class="col-sm-2 control-label">订单时间</label>
         <label class="col-sm-2 control-label">收款时间</label>
         <div class="col-sm-4">
            <input autocomplete="off"   name="orderTime" type="text"
            <input autocomplete="off"   name="payTime" type="text"
               class="form-control  datetimepicker"
                  th:value="${#dates.format(order.orderTime, 'yyyy-MM-dd hh:mm')}" />
                  th:value="${#dates.format(order.payTime, 'yyyy-MM-dd hh:mm')}" />
         </div>
   </div>
<br>