Merge remote-tracking branch 'origin/main'

policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/ServiceProjectSecurityUserPagerVo.java

@@ -29,6 +29,9 @@ public class ServiceProjectSecurityUserPagerVo {
     @Schema(description = "名称")
     private String name;
 
+    @Schema(description = "照片")
+    private String photo;
+
     @Desensitized(value = DesensitizedUtil.DesensitizedType.MOBILE_PHONE, keepOriginalField = true)
     @Schema(description = "手机号")
     private String telephone;
@@ -51,6 +54,8 @@ public class ServiceProjectSecurityUserPagerVo {
 
     @Schema(description = "保安证号")
     private String securityNumber;
+    @Schema(description = "无证说明")
+    private String noSecurityNumberDesc;
 
     @Schema(description = "家庭住址")
     private String homeAddress;

policeSecurityServer/src/main/java/com/changhu/task/SecurityAssociationDockingServiceTask.java

@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class SecurityAssociationDockingServiceTask {
 
-    private static final String BASE_HOST = "http://tkgl.3589hn.cn";
+    private static final String BASE_HOST = "http://baxh.3589hn.cn";
 
     private static String TOKEN;
 
@@ -32,7 +32,7 @@ public class SecurityAssociationDockingServiceTask {
     public void getToken() {
         JSONObject params = new JSONObject();
         params.put("appid", "anfang");
-        params.put("appkey", "fcfefda716dc4760af44973bcf157a01");
+        params.put("appkey", "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCg");
         //创建请求
         HttpRequest request = HttpUtil.createPost(BASE_HOST + "/api/security/get_token");
         //设置参数