Merge pull request #6 from yili1992/dev

Dev

Author: yili1992

TAC_Executor/README.md

@@ -20,7 +20,7 @@ zkserver=127.0.0.1:2181
 
 ## 部署TAC_Server
 - 执行 mvn package ，会产生tac-executor.jar文件在/target下
-- nohup java -jar tac-executor.jar &
+- nohup java -Ddubbo.qos.port=33333 -jar tac-executor.jar > /dev/null  2>&1 &
 
 
 

TACase/src/pages/PostList/components/TabTable/components/EditDialog.jsx

@@ -1,8 +1,18 @@
 /*
  * @Author: zhao lee
  * @Date: 2018-04-16 19:36:42
+<<<<<<< HEAD
+<<<<<<< HEAD
+ * @Last Modified by: zhaoli@leoao.com
+ * @Last Modified time: 2018-05-19 10:13:39
+=======
+ * @Last Modified by: zhao lee
+ * @Last Modified time: 2018-04-17 20:15:41
+>>>>>>> master
+=======
  * @Last Modified by: zhaoli
  * @Last Modified time: 2018-05-19 10:13:39
+>>>>>>> master
  */
 import React, { Component } from 'react';
 import { Dialog, Button, Form, Input, Field, Select, Upload } from '@icedesign/base';