Merge branch 'pre' into 'master'

提交快递面单 76*130 See merge request !348

Merge branch 'pre' into 'master'
提交快递面单 76*130 See merge request !348
aeb27e75 · 胡佳晨 · 18ba90e8 · 49a98947 · aeb27e75 · aeb27e75
Commit aeb27e75 authored Oct 31, 2023 by 胡佳晨
Showing with 130 additions and 166 deletions

performanceOrderList.html ...ngzai/kylin/performancesExpress/performanceOrderList.html +65 -83

performancesList.html .../zhengzai/kylin/performancesExpress/performancesList.html +65 -83

No files found.
--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesList.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesList.html