liting2017 6 anos atrás
pai
commit
09085adc56

+ 0 - 4
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -417,11 +417,7 @@ const Task = React.createClass({
                     closeDesc={this.closeAssign.bind(this)}
                     fenpaiData={8}
                     specially={0}
-<<<<<<< HEAD
                     roleName={this.state.nub}
-=======
-                    roleName={this.state.nub?'咨询师':'咨询师经理'}
->>>>>>> 29f0453ff88cd1dc1d10b9537d5ea89040bf8e40
                 />
                 <Modal	
 				      className="customeDetails"