Merge remote-tracking branch 'origin/master' into master

调整
--- a/application/admin/view/order_main/add.html
+++ b/application/admin/view/order_main/add.html
@@ -1 +1 @@
 <script>window.id = ''</script><!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.5256ce95b1a4552204b93fb3f52032dc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.926d659ee6721ed3378c.js></script></body></html>
 <script>window.id = ''</script><!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.b5af37104fb9e2174e85c43b4ac6fbc5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.42ca50ff00c83878953d.js></script></body></html>
--- a/application/admin/view/order_main/edit.html
+++ b/application/admin/view/order_main/edit.html
@@ -1 +1 @@
 <input id="c-id" type="hidden" value="{$row.id}"><script>window.id = document.getElementById('c-id').value</script><!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.5256ce95b1a4552204b93fb3f52032dc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.926d659ee6721ed3378c.js></script></body></html>
 <input id="c-id" type="hidden" value="{$row.id}"><script>window.id = document.getElementById('c-id').value</script><!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.b5af37104fb9e2174e85c43b4ac6fbc5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.42ca50ff00c83878953d.js></script></body></html>
--- a/public/static/css/app.b5af37104fb9e2174e85c43b4ac6fbc5.css
+++ b/public/static/css/app.b5af37104fb9e2174e85c43b4ac6fbc5.css
--- a/public/static/js/app.42ca50ff00c83878953d.js
+++ b/public/static/js/app.42ca50ff00c83878953d.js
--- a/public/static/js/app.926d659ee6721ed3378c.js
+++ b/public/static/js/app.926d659ee6721ed3378c.js
Автор	SHA1	Сообщение	Дата
xubinxcode	a45be2beb4	Merge remote-tracking branch 'origin/master' into master	3 лет назад
xubinxcode	02e27fb4f0	调整	3 лет назад