修复bug

one_stop_public/tableCompon/index.jsx

@@ -1104,13 +1104,8 @@ export default class tableCom extends Component {
       const obj = { ...this.props.obj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
 
 
-<<<<<<< HEAD
-      const value = fun1(obj,this.props.init, this.props.defaultValues, { clientType: this.props.get }, this.props.index, this.props.fatherCode,
-        {
-=======
       const value = fun1(obj,this.props.init, this.props.defaultValues, { clientType: this.props.get,formCode:this.props.formCode,formId:this.props.formId }, this.props.index, this.props.fatherCode,
         { 
->>>>>>> b2747db5f35669ed350d5ebb2bf1ce42c5064462
           moment: moment,
           sql: this.sqlUtil.bind(this, base52, json,callback),
           message: message,router:router,