Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_back into dev

src/main/vue/src/views/Admin.vue

@@ -198,6 +198,16 @@ export default {
 									parent: '3410316',
 									root: false,
 									active: true
+								},
+								{
+									id: '3410399',
+									name: '铸造者',
+									path: '/minterList',
+									icon: '',
+									sort: 45,
+									parent: '3410272',
+									root: false,
+									active: true
 								}
 							]
 						},

src/main/vue/src/views/CollectionEdit.vue

@@ -46,7 +46,7 @@
                         <el-input-number v-model="yOffset"></el-input-number>
                     </el-form-item>
                     <div class="inline-wrapper">
-                        <el-form-item prop="minterId" label="铸造者" v-if="!isMeta">
+                        <el-form-item prop="minterId" label="铸造者">
                             <minter-select
                                 v-model="formData.minterId"
                                 @detail="onMinterDetail"