feat:处理合并代码后的冲突

src/common/js/config.ts

@@ -2,7 +2,7 @@
  * @Author: zhangleyuan
  * @Author: zhangleyuan
  * @Date: 2021-01-05 10:55:02
  * @Date: 2021-01-05 10:55:02
  * @LastEditors: zhangleyuan
  * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-15 22:01:51
+ * @LastEditTime: 2021-01-21 11:32:33
  * @Description: 描述一下
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */

src/domains/basic-domain/constants.ts

 /*
 /*
  * @Author: 陈剑宇
  * @Author: 陈剑宇
  * @Date: 2020-05-07 14:43:01
  * @Date: 2020-05-07 14:43:01
- * @LastEditTime: 2020-11-09 09:52:03
- * @LastEditors: 吴文洁
+ * @LastEditTime: 2021-01-21 11:29:39
+ * @LastEditors: zhangleyuan
  * @Description: 
  * @Description: 
  * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
  * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
  */
  */
 import { MapInterface } from '@/domains/basic-domain/interface'
 import { MapInterface } from '@/domains/basic-domain/interface'
 
 
 // 默认是 dev 环境
 // 默认是 dev 环境
-const ENV: string = process.env.DEPLOY_ENV || 'dev';
+const ENV: string = process.env.DEPLOY_ENV || 'prod';
 
 
 const BASIC_HOST_MAP: MapInterface = {
 const BASIC_HOST_MAP: MapInterface = {
   dev: 'https://dev-heimdall.xiaomai5.com/',
   dev: 'https://dev-heimdall.xiaomai5.com/',
   dev1: 'https://dev1-heimdall.xiaomai5.com/',
   dev1: 'https://dev1-heimdall.xiaomai5.com/',
   rc: 'https://rc-heimdall.xiaomai5.com/',
   rc: 'https://rc-heimdall.xiaomai5.com/',
   gray: 'https://gray-heimdall.xiaomai5.com/',
   gray: 'https://gray-heimdall.xiaomai5.com/',
-  prod: 'https://gateway-heimdall.xiaomai5.com/'
+  prod: 'https://heimdall.xiaomai5.com/'
 };
 };
 
 
 // axios headers config
 // axios headers config