Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserDto.java

@@ -38,4 +38,7 @@ public class UserDto {
     @ApiModelProperty(value = "机构编码")
     private String bizOrgCode;
 
+    @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
+    private String bizOrgType;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -428,7 +428,8 @@ GROUP BY
             '2' AS identityType,
             u.biz_org_code,
             f.field_code,
-            f.field_value
+            f.field_value,
+            u.biz_org_type
         FROM
             `cb_org_usr` u
             LEFT JOIN cb_dynamic_form_instance f ON f.instance_id = u.sequence_nbr