Merge branch 'master' into develop

# Conflicts:
#	.env.development
#	vue.config.js

src/views/finance/change-balance-opt.vue

@@ -38,10 +38,12 @@
               <el-form-item :label="$t('common.note')"><!--备注-->
                 <el-input v-model="form.remark"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('financial.forgeDisplayRemark')" v-show="false"><!--备注前台显示-->
+              <!--备注前台显示-->
+              <!-- <el-form-item :label="$t('financial.forgeDisplayRemark')">
+              <el-form-item :label="$t('financial.forgeDisplayRemark')" v-show="false">
                 <el-switch v-model="form.isShow" active-value="1" inactive-value="0">
                 </el-switch>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item>
                 <el-button type="primary" :loading="submitButtonStat" :disabled="getCodeStat" @click="onSubmit">{{ $t('common.confirm') }}<!-- 提交 --></el-button>
               </el-form-item>