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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfIcbcController.java

@@ -55,7 +55,7 @@ public class HygfIcbcController extends BaseController {
     }
 
     /**
-     * 获取电子钱包信息
+     * 从工行获取电子钱包信息
      * @param req
      * @param resp
      * @return
@@ -93,6 +93,13 @@ public class HygfIcbcController extends BaseController {
     }
 
     @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @GetMapping (value = "/getWalletInfo/{userId}")
+    @ApiOperation (httpMethod = "GET", value = "根据农户userId查询注册电子钱包", notes = "注册电子钱包")
+    public ResponseModel<JftApiUserEntrustopenacctQueryResponseV1> getHygfIcbcWalletInfo(@PathVariable String userId) {
+        return ResponseHelper.buildResponse(hygfIcbcService.getHygfIcbcWalletInfo(userId));
+    }
+
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
     @GetMapping (value = "/list")
     @ApiOperation (httpMethod = "GET", value = "聚富通电子钱包列表查询", notes = "聚富通电子钱包列表查询")
     @UserLimits