%!s(int64=3) %!d(string=hai) anos · 936d06c715
--- a/dist/index.html
+++ b/dist/index.html
--- a/dist/static/css/app.cb47cc66.css
+++ b/dist/static/css/app.cb47cc66.css
--- a/dist/static/css/app.cb47cc66.css.gz
+++ b/dist/static/css/app.cb47cc66.css.gz
--- a/dist/static/css/chunk-732708e0.74062080.css.gz
+++ b/dist/static/css/chunk-732708e0.74062080.css.gz
--- a/dist/static/css/chunk-91691dee.2a7df93e.css
+++ b/dist/static/css/chunk-91691dee.2a7df93e.css
--- a/dist/static/css/chunk-91691dee.2a7df93e.css.gz
+++ b/dist/static/css/chunk-91691dee.2a7df93e.css.gz
--- a/dist/static/js/0.js
+++ b/dist/static/js/0.js
--- a/dist/static/js/app.734e1e3c.js.gz
+++ b/dist/static/js/app.734e1e3c.js.gz
--- a/dist/static/js/app.f62e4af5.js
+++ b/dist/static/js/app.f62e4af5.js
--- a/dist/static/js/app.f62e4af5.js.gz
+++ b/dist/static/js/app.f62e4af5.js.gz
--- a/dist/static/js/app.js
+++ b/dist/static/js/app.js
--- a/dist/static/js/chunk-732708e0.49817cd5.js
+++ b/dist/static/js/chunk-732708e0.49817cd5.js
--- a/dist/static/js/chunk-732708e0.49817cd5.js.gz
+++ b/dist/static/js/chunk-732708e0.49817cd5.js.gz
--- a/dist/static/js/chunk-91691dee.246803af.js
+++ b/dist/static/js/chunk-91691dee.246803af.js
--- a/dist/static/js/chunk-91691dee.246803af.js.gz
+++ b/dist/static/js/chunk-91691dee.246803af.js.gz
--- a/src/views/goodStore/goodsCost/components/baseForm.vue
+++ b/src/views/goodStore/goodsCost/components/baseForm.vue
@@ -1820,11 +1820,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;