Merge branch 'wms_dev' into wms_dev_hbbf

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd_oms/pom.xml

mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/CustomerDTO.java

@@ -47,4 +47,36 @@ public class CustomerDTO extends BaseVOEntity {
     @ApiModelProperty("详细地址")
     private String userAreaAddress;
 
+    @ApiModelProperty("法人代表")
+    private String legalRepresentative;
+
+    @ApiModelProperty("统一编码")
+    private String unifiedCode;
+
+    @ApiModelProperty("注册电话")
+    private String registeredPhone;
+
+    @ApiModelProperty("注册地址")
+    private String registeredAddress;
+
+    @ApiModelProperty("传真")
+    private String fax;
+
+    @ApiModelProperty("付款银行")
+    private String paymentBank;
+
+    @ApiModelProperty("付款账户")
+    private String paymentAccount;
+
+    @ApiModelProperty("发票抬头")
+    private String invoiceTitle;
+
+    @ApiModelProperty("税号")
+    private String taxNumber;
+
+    @ApiModelProperty(name = "邮箱")
+    private String userEmail;
+
+    @ApiModelProperty(name = "备注")
+    private String userRemark;
 }

mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java

@@ -241,4 +241,10 @@ public class UserDTO extends BaseVOEntity {
 
     @ApiModelProperty( "制单员nc编码")
     private String documentPreparerNcCode;
+
+    @ApiModelProperty(value = "紧急联系人姓名")
+    private String emergencyContactName;
+
+    @ApiModelProperty(value = "紧急联系电话")
+    private String emergencyContactPhone;
 }

mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserAPI.java

@@ -201,6 +201,14 @@ public class UserAPI extends BaseController {
         return AjaxResult.success(userPo);
     }
 
+    @Log(title = "用户中台管理-查询", description ="根据用户ID查询用户详细信息",businessType = BusinessType.INQUIRE)
+    @ApiOperation("根据用户ID查询用户详细信息")
+    @GetMapping("/getInfoByName/{userName}")
+    public AjaxResult getInfoByName(@PathVariable("userName") String userName) {
+        UserPo userPo = userApplicationService.selectByUserName(userName);
+        return AjaxResult.success(userPo);
+    }
+
     /**
      * @Description 新增租户，新增货主，新增司机，新增员工，用户注册等
      * @Author Alex
@@ -946,4 +954,4 @@ public class UserAPI extends BaseController {
     public R<String> finShipperEnterpriseNamedByUserId(@PathVariable("userId") Long userId) {
         return R.ok(userApplicationService.finShipperEnterpriseNamedByUserId(userId));
     }
-}
+}