Merge branch 'master' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform; branch 'dev_shibei_match' of http://git.elinkit.com.cn:7070/r/epmet-cloud into master_for_shibei

epmet-auth-client/src/main/java/com/epmet/auth/feign/EpmetAuthOpenFeignClient.java

@@ -29,6 +29,6 @@ public interface EpmetAuthOpenFeignClient {
      * @author wangc
      * @date 2020.08.13 10:22
      **/
-    @PostMapping("/auth/govweb/generateTokenBySSOKey/{uuid}/{userId}/{app}")
+    @PostMapping("/auth/govweb/generateTokenBySSOKey/{uuid}/{userId}/{app}/{client}")
     Result<String> generateTokenBySSOKey(@PathVariable(value = "uuid") String uuid, @PathVariable String userId, @RequestParam String customerId, @RequestParam String app, @RequestParam String client);
 }