Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java

@@ -143,7 +143,14 @@ public interface JcsFeign {
      * @return ResponseModel<OrgUsrDto>
      */
     @GetMapping(value = "/org-usr/{authKey}/listWithAuth")
-    FeignClientResult<List<OrgUsrDto>> getCompanyDeptListWithAuth(@PathVariable(value = "authKey") String authKey, @RequestParam(value = "orgTypes", required = false) String orgTypes, @RequestParam(value = "type", required = false) String type);
+    FeignClientResult<List<OrgUsrDto>> getCompanyDeptListWithAuth(
+            @RequestHeader(value = "Appkey") String appKey,
+            @RequestHeader(value = "Product") String product,
+            @RequestHeader(value = "Token") String token,
+            @PathVariable(value = "authKey") String authKey,
+            @RequestParam(value = "orgTypes", required = false) String orgTypes,
+            @RequestParam(value = "type", required = false) String type
+    );
 
     @GetMapping(value = "/org-usr/{authKey}/listWithAuthToPartol")
     FeignClientResult<List<OrgUsrDto>> getCompanyDeptListWithAuthToPartol(@PathVariable(value = "authKey") String authKey, @RequestParam(value = "orgTypes", required = false) String orgTypes);