Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/glxp/api/controller/purchase/SupCertController.java

src/main/java/com/glxp/api/controller/sup/UserRegisterController.java

@@ -211,9 +211,9 @@ public class UserRegisterController extends BaseController {
 //        BeanUtils.copyProperties(registComPerResponse,userPersonEntity);
         BeanUtils.copyProperties(registComPerResponse, userCompanyEntity);
         userRegisterEntity.setId(Long.valueOf(registComPerResponse.getUrId()));
-
+        System.out.println(Long.valueOf(registComPerResponse.getUrId()));
 //        userPersonEntity.setId(Long.valueOf(registComPerResponse.getUpId()));
-        userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUcId()));
+        userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUrId()));
         userCompanyEntity.setContactWay(registComPerResponse.getFmobile());
         if ("key".equals(registComPerResponse.getKey())) {
             //提交审核

src/main/java/com/glxp/api/entity/sup/UserCertEntity.java

@@ -175,5 +175,6 @@ public class UserCertEntity implements Serializable {
     private String auditComment;
 
 
+
     private static final long serialVersionUID = 1L;
 }