há 3 anos atrás · 08fbd715ea
--- a/dist/index.html
+++ b/dist/index.html
--- a/dist/static/css/app.f8af5d15.css
+++ b/dist/static/css/app.f8af5d15.css
--- a/dist/static/css/app.f8af5d15.css.gz
+++ b/dist/static/css/app.f8af5d15.css.gz
--- a/dist/static/css/chunk-2e71f542.db072c26.css
+++ b/dist/static/css/chunk-2e71f542.db072c26.css
--- a/dist/static/css/chunk-2e71f542.db072c26.css.gz
+++ b/dist/static/css/chunk-2e71f542.db072c26.css.gz
--- a/dist/static/css/chunk-49702bf7.05d967ec.css.gz
+++ b/dist/static/css/chunk-49702bf7.05d967ec.css.gz
--- a/dist/static/js/app.319d15f8.js
+++ b/dist/static/js/app.319d15f8.js
--- a/dist/static/js/app.319d15f8.js.gz
+++ b/dist/static/js/app.319d15f8.js.gz
--- a/dist/static/js/app.f943a087.js
+++ b/dist/static/js/app.f943a087.js
--- a/dist/static/js/app.f943a087.js.gz
+++ b/dist/static/js/app.f943a087.js.gz
--- a/dist/static/js/chunk-02bc9a03.c4327f97.js
+++ b/dist/static/js/chunk-02bc9a03.c4327f97.js
--- a/dist/static/js/chunk-02bc9a03.c4327f97.js.gz
+++ b/dist/static/js/chunk-02bc9a03.c4327f97.js.gz
--- a/dist/static/js/chunk-02bc9a03.c4c110d3.js.gz
+++ b/dist/static/js/chunk-02bc9a03.c4c110d3.js.gz
--- a/dist/static/js/chunk-2e71f542.2e5de02c.js
+++ b/dist/static/js/chunk-2e71f542.2e5de02c.js
--- a/dist/static/js/chunk-2e71f542.2e5de02c.js.gz
+++ b/dist/static/js/chunk-2e71f542.2e5de02c.js.gz
--- a/dist/static/js/chunk-49702bf7.9d13a8f8.js
+++ b/dist/static/js/chunk-49702bf7.9d13a8f8.js
--- a/dist/static/js/chunk-49702bf7.9d13a8f8.js.gz
+++ b/dist/static/js/chunk-49702bf7.9d13a8f8.js.gz
--- a/src/views/goodStore/goodsCost/components/baseForm.vue
+++ b/src/views/goodStore/goodsCost/components/baseForm.vue
@@ -1745,12 +1745,7 @@ export default {
 
				         "is_diff",
			
 
				         "config",
			
 
				         "other_config",
			
 
				-<<<<<<< HEAD
			
 
				         'cgd_gold_price'
			
 
				-=======
			
 
				-        "cgd_gold_price",
			
 
				-        
			
 
				->>>>>>> sit
			
 
				       ];
			
 
				       for (let i = 0; i < list.length; i++) {
			
 
				         this.rulesThis[list[i]][0].required = this.is_noble;