修改

3 months ago · 02df9e83c2
parent bd7c9039c8
commit 02df9e83c2
6 changed files with 9 additions and 4 deletions
--- a/5
+++ b/5
@ -0,0 +1,5 @@
+Merge branch 'master' of ssh://47.101.48.251:/data/git/wx.sstbc.com
+# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
+# 合并到主题分支。
+#
+# 以 '#' 开始的行将被忽略，而空的提交说明将终止提交。
--- a/public/admin/index.html
+++ b/public/admin/index.html
--- a/public/admin/static/css/chunk-b2e77d62.682824d9.css
+++ b/public/admin/static/css/chunk-b2e77d62.682824d9.css
--- a/public/admin/static/js/app.49f7808d.js
+++ b/public/admin/static/js/app.49f7808d.js
--- a/public/admin/static/js/chunk-16390e1a.a86a2656.js
+++ b/public/admin/static/js/chunk-16390e1a.a86a2656.js
--- a/public/admin/static/js/chunk-b2e77d62.c7dd4e4b.js
+++ b/public/admin/static/js/chunk-b2e77d62.c7dd4e4b.js