Merge branch 'refs/heads/dev_qinhongzhan' into dev

# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
#	mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java

mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java

@@ -64,4 +64,10 @@ public class QueryAllShipperInfoVo {
 
     @ApiModelProperty(name = "客户nc编码")
     private String customerNcCode;
+
+    @ApiModelProperty(name = "组织ID")
+    private Long organizationId;
+
+    @ApiModelProperty(name = "一级组织ID")
+    private Long topOrganizationId;
 }