Merge branch 'gdd' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonVo.java

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.List;
+
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.List;
-
 /**
 * 机构/部门/人员表
 *
@@ -18,21 +19,20 @@ import java.util.List;
 */
 @Data
 @Accessors(chain = true)
-@TableName("cb_org_usr")
 @ApiModel(value="OrgUsrVo", description="人员")
-public class OrgPersonVo {
+public class OrgPersonVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "人员基本信息")
-    private  OrgUsr OrgUsr;
+    private  OrgUsr orgUsr;
 
     @ApiModelProperty(value = "动态表单值")
     private List<AlertFormValue> alertFormValue;
 
     public OrgPersonVo(OrgUsr orgUsr, List<AlertFormValue> alertFormValue) {
-        OrgUsr = orgUsr;
+    	this.orgUsr = orgUsr;
         this.alertFormValue = alertFormValue;
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgPersonController.java

@@ -170,7 +170,7 @@ public class OrgPersonController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public IPage<OrgUsr> listPage(String pageNum, String pageSize, OrgUsr orgUsr) {
+    public ResponseModel<Object> listPage(String pageNum, String pageSize, OrgUsr orgUsr) {
 
         Page<OrgUsr> pageBean;
         QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
@@ -206,7 +206,7 @@ public class OrgPersonController {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
-        return page;
+        return  ResponseHelper.buildResponse(page);
     }
 
     /**
@@ -235,7 +235,7 @@ public class OrgPersonController {
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "download-template/{type}", method = RequestMethod.POST)
+    @RequestMapping(value = "download-template", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "导出人员模板", notes = "导出人员模板")
     public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");