Merge remote-tracking branch 'origin/master'

one_stop_public/tableCompon/index.jsx

@@ -1695,8 +1695,15 @@ export default class tableCom extends Component {
       }
     }
     if (!isEdit) {
+     
       if (this.props.fatherCode) {
-        dataColumn.base52 = this.props.uuid
+        if(bindObj!=null){
+          dataColumn.base52 = bindObj.base52
+        }else{
+          dataColumn.base52 = this.props.uuid
+        }
+      
+       
       }