Merge remote-tracking branch 'origin/main'

# Conflicts:
#	srs-survey/src/main/java/com/srs/survey/domain/SurItinerary.java
#	srs-survey/src/main/java/com/srs/survey/service/impl/SurItineraryServiceImpl.java

srs-survey/src/main/java/com/srs/survey/domain/SurItinerary.java

@@ -116,7 +116,6 @@ private static final long serialVersionUID=1L;
     @ApiModelProperty("联系电话")
     @TableField("phone")
     @Excel(name = "联系电话")
-    @Sensitive(desensitizedType = DesensitizedType.PHONE)
     public String phone;
 
     /**
@@ -133,7 +132,6 @@ private static final long serialVersionUID=1L;
     @ApiModelProperty("紧急联系人电话")
     @TableField("emergency_contact_phone")
     @Excel(name = "紧急联系人电话")
-    @Sensitive(desensitizedType = DesensitizedType.PHONE)
     public String emergencyContactPhone;
 
     /**
@@ -171,6 +169,13 @@ private static final long serialVersionUID=1L;
     @Excel(name = "住宿楼栋")
     @TableField(exist = false)
     public String buildingName;
+    /**
+     * 家长电话
+     */
+    @ApiModelProperty("家长电话")
+    @TableField("parent_phone")
+    @Excel(name = "家长电话")
+    public String parentPhone;
 
     @Excel(name = "宿舍号")
     @TableField(exist = false)
@@ -340,4 +345,11 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     public Long pageSize;
 
+    /**
+     * 是否填写筛选条件：null-全部，1-已填写，0-未填写
+     */
+    @ApiModelProperty("是否填写筛选条件")
+    @TableField(exist = false)
+    public Integer isFilled;
+
 }

srs-survey/src/main/java/com/srs/survey/service/ISurItineraryService.java

@@ -69,6 +69,8 @@ public interface ISurItineraryService extends IService<SurItinerary> {
 
     public AjaxResult manyLeaveAudit(Long[] ids);
 
+    public AjaxResult manyLeaveReject(Long[] ids);
+
     public AjaxResult leaveAudit(SurItinerary param);
 
     public List<SurItinerary> listView(SurItinerary param);