Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-07-05 abaf72a337248943e037b02d069c094e2ee5d60b

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java

@@ -53,10 +53,11 @@
   /**
    * 根据水库编号查询除责任人之外的人员信息
    * @param res_cd
    * @param areaList
    * @return
    */
   @GetMapping(GET_USER_LIST_BY_RES_GUID)
   List<PersonVO> getUserListByResGuid(@RequestParam("res_cd") String res_cd);
   List<PersonVO> getUserListByResGuid(@RequestParam("res_cd") String res_cd, @RequestParam("areaList") String areaList);

   @PostMapping(SYNCHARONIZATION_ADD_USER)
   int syncharonization_add_user();