diff --git a/bitcopay后台-开发环境.zip b/bitcopay后台-开发环境.zip
index fa73609..2531364 100644
Binary files a/bitcopay后台-开发环境.zip and b/bitcopay后台-开发环境.zip differ
diff --git a/bitcopay后台-正式环境.zip b/bitcopay后台-正式环境.zip
new file mode 100644
index 0000000..510b404
Binary files /dev/null and b/bitcopay后台-正式环境.zip differ
diff --git a/src/views/otc/OtcStoreBondConfig/index.vue b/src/views/otc/OtcStoreBondConfig/index.vue
index 2df1bf2..6f58103 100644
--- a/src/views/otc/OtcStoreBondConfig/index.vue
+++ b/src/views/otc/OtcStoreBondConfig/index.vue
@@ -88,7 +88,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
-              v-hasPermi="['otc:OtcStoreBondConfig:edit']">修改</el-button>
+              v-hasPermi="['otc:OtcStoreBondConfig:edit']">编辑</el-button>
             <!--          <el-button-->
             <!--            size="mini"-->
             <!--            type="text"-->
diff --git a/src/views/otc/otcStore/index.vue b/src/views/otc/otcStore/index.vue
index a1e8aae..334b596 100644
--- a/src/views/otc/otcStore/index.vue
+++ b/src/views/otc/otcStore/index.vue
@@ -329,12 +329,12 @@
                 <el-form-item label="谷歌秘钥" prop="merchantNo">
                     <span>{{ form.googleCaptcha }}</span>
                     <el-button type="primary" @click="submitForm('googleKey')" style="margin-left: 10px"
-                        v-hasPermi="['system:merchant:resetGoogleSecret']">重 置</el-button>
+                        v-hasPermi="['merchant:merchant:resetGoogleSecret']">重 置</el-button>
                 </el-form-item>
                 <el-form-item label="密钥" prop="merchantNo">
                     <span>{{ form.md5Key }}</span>
                     <el-button type="primary" @click="submitForm('MD5')" style="margin-left: 10px"
-                        v-hasPermi="['system:merchant:resetMd5Key']">重 置</el-button>
+                        v-hasPermi="['merchant:merchant:resetMd5Key']">重 置</el-button>
                 </el-form-item>
                 <el-form-item label="谷歌验证码" prop="code">
                     <el-input v-model="form.code" placeholder="请输入谷歌验证码" />
@@ -342,7 +342,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitForm('formControl')"
-                    v-hasPermi="['system:merchant:resetMerchantWindControl']">保 存</el-button>
+                    v-hasPermi="['merchant:merchant:resetMerchantWindControl']">保 存</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
diff --git a/src/views/user/ad/index.vue b/src/views/user/ad/index.vue
index 2661c37..fb15f09 100644
--- a/src/views/user/ad/index.vue
+++ b/src/views/user/ad/index.vue
@@ -75,7 +75,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['ad:ad:edit']"
-        >修改</el-button>
+        >编辑</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
diff --git a/src/views/user/mail/index.vue b/src/views/user/mail/index.vue
index 6e0781d..4fd864b 100644
--- a/src/views/user/mail/index.vue
+++ b/src/views/user/mail/index.vue
@@ -81,7 +81,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['user:mail:edit']"
-        >修改</el-button>
+        >编辑</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
diff --git a/src/views/user/position/index.vue b/src/views/user/position/index.vue
index 92a5219..a1ee098 100644
--- a/src/views/user/position/index.vue
+++ b/src/views/user/position/index.vue
@@ -31,7 +31,7 @@
           type="primary"
           size="medium"
           @click="handleAdd"
-          v-hasPermi="['ad:position:add']"
+          v-hasPermi="['ad:AdPosition:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -40,8 +40,8 @@
           size="medium"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['ad:position:edit']"
-        >修改</el-button>
+          v-hasPermi="['ad:AdPosition:edit']"
+        >编辑</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -49,7 +49,7 @@
           size="medium"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['ad:position:remove']"
+          v-hasPermi="['ad:AdPosition:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -57,7 +57,7 @@
           type="primary"
           size="medium"
           @click="handleExport"
-          v-hasPermi="['ad:position:export']"
+          v-hasPermi="['ad:AdPosition:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -75,13 +75,13 @@
             size="medium"
             type="text"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['ad:position:edit']"
+            v-hasPermi="['ad:AdPosition:edit']"
           >编辑</el-button>
           <el-button
             size="medium"
             type="text"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['ad:position:remove']"
+            v-hasPermi="['ad:AdPosition:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/user/type/index.vue b/src/views/user/type/index.vue
index 3488530..4248a01 100644
--- a/src/views/user/type/index.vue
+++ b/src/views/user/type/index.vue
@@ -44,7 +44,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['user:type:edit']"
-        >修改</el-button>
+        >编辑</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -76,14 +76,12 @@
           <el-button
             size="medium"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['user:type:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="medium"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['user:type:remove']"
           >删除</el-button>