Merge branch 'feat-20230720-eidendtype' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -4356,7 +4356,9 @@ public class ApiController {
 							@RequestParam(value = "realName") String realName,
 							@RequestParam(value = "endType", required = false) String endType) {
 
-		endType = upmsConfig.getEndType();
+		if (StrUtil.isBlank(endType)) {
+			endType = upmsConfig.getEndType();
+		}
 
 		String tokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/eid?idCard={idCard}&realName={realName}&endType={endType}";
 
@@ -4382,7 +4384,9 @@ public class ApiController {
 	public R<?> getEidResult(@RequestParam(value = "token") String token,
 							 @RequestParam(value = "endType", required = false) String endType) {
 
-		endType = upmsConfig.getEndType();
+		if (StrUtil.isBlank(endType)) {
+			endType = upmsConfig.getEndType();
+		}
 
 		String tokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/eid/result?token={token}&endType={endType}";