Merge remote-tracking branch 'origin/master'

one_stop_public/tableCompon/index.jsx

@@ -1695,11 +1695,18 @@ export default class tableCom extends Component {
       }
     }
     if (!isEdit) {
+     
       if (this.props.fatherCode) {
+        if(bindObj!=null){
+          dataColumn.base52 = bindObj.base52
+        }else{
           dataColumn.base52 = this.props.uuid
         }
       
        
+      }
+
+
       switch (json.comName) {
         // 电子签章展示
         // case 'Signature':