пре 3 година · 81c6c59fb2
--- a/dist/index.html
+++ b/dist/index.html
--- a/dist/static/css/chunk-21338aa1.45572999.css
+++ b/dist/static/css/chunk-21338aa1.45572999.css
--- a/dist/static/css/chunk-21338aa1.45572999.css.gz
+++ b/dist/static/css/chunk-21338aa1.45572999.css.gz
--- a/dist/static/css/chunk-a2f7dd56.23a024cd.css.gz
+++ b/dist/static/css/chunk-a2f7dd56.23a024cd.css.gz
--- a/dist/static/js/0.js
+++ b/dist/static/js/0.js
--- a/dist/static/js/app.926ac062.js
+++ b/dist/static/js/app.926ac062.js
--- a/dist/static/js/app.926ac062.js.gz
+++ b/dist/static/js/app.926ac062.js.gz
--- a/dist/static/js/app.d2262dfb.js.gz
+++ b/dist/static/js/app.d2262dfb.js.gz
--- a/dist/static/js/chunk-21338aa1.a280af5d.js
+++ b/dist/static/js/chunk-21338aa1.a280af5d.js
--- a/dist/static/js/chunk-21338aa1.a280af5d.js.gz
+++ b/dist/static/js/chunk-21338aa1.a280af5d.js.gz
--- a/dist/static/js/chunk-a2f7dd56.f90b340b.js
+++ b/dist/static/js/chunk-a2f7dd56.f90b340b.js
--- a/dist/static/js/chunk-a2f7dd56.f90b340b.js.gz
+++ b/dist/static/js/chunk-a2f7dd56.f90b340b.js.gz
--- a/src/assets/js/btnList.js
+++ b/src/assets/js/btnList.js
@@ -76,10 +76,7 @@ const btnList = [
 
				   { code: "075", name: "编辑支持品牌" },
			
 
				   { code: "076", name: "启/禁用支持品牌" },
			
 
				   { code: "077", name: "删除支持品牌" },
			
 
				-<<<<<<< HEAD
			
 
				-=======
			
 
				   { code: "078", name: "再次发起审核流程" },
			
 
				->>>>>>> sit
			
 
				 
			
 
				 ];
			
 
				 export default btnList;