Merge remote-tracking branch 'origin/main'

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java

@@ -173,4 +173,7 @@ public class ESJobDocument
 
     @ApiModelProperty("重点人群-1农民工、2团场职工、3失业人员、4零就业家庭、5零工人员、6退役军人")
     private String keyPopulations;
+
+    @ApiModelProperty("岗位特征：（行政、后勤、管理、技术、销售等字典job_feature添加）")
+    private String jobFeature;
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java

@@ -254,6 +254,9 @@ public class Job extends BaseEntity
     @ApiModelProperty("状态 0上架，1下架")
     private String jobStatus;
 
+    @ApiModelProperty("岗位特征：（行政、后勤、管理、技术、销售等字典job_feature添加）")
+    private String jobFeature;
+
     @TableField(exist = false)
     @ApiModelProperty("户外招聘会岗位审核状态")
     private String fairReviewStatus;

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/query/ESJobSearch.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cms.domain.query;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.cms.domain.Job;
+import com.ruoyi.common.core.domain.entity.UserWorkExperiences;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -63,4 +63,13 @@ public class ESJobSearch extends Job
 
     //结束时间
     private Date endDate;
+
+    /**岗位收藏集合*/
+    private List<String> collectNames;
+
+    /**岗位申请集合*/
+    private List<String> applyNames;
+
+    /**工作经历*/
+    private List<UserWorkExperiences> userWorkExperiences;
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/rc/PublicJobFairDetail.java

@@ -27,6 +27,18 @@ public class PublicJobFairDetail implements Serializable {
     @ApiModelProperty("招聘会地址")
     private String jobFairAddress;
 
+    @ApiModelProperty("主办单位")
+    private String jobFairHostUnit;
+
+    @ApiModelProperty("协办单位")
+    private String jobFairHelpUnit;
+
+    @ApiModelProperty("承办单位")
+    private String jobFairOrganizeUnit;
+
+    @ApiModelProperty("联系电话")
+    private String jobFairPhone;
+
     @ApiModelProperty("招聘会简介")
     private String jobFairIntroduction;
 
@@ -38,6 +50,14 @@ public class PublicJobFairDetail implements Serializable {
     @ApiModelProperty("招聘会结束时间")
     private Date jobFairEndTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("报名开始时间")
+    private Date jobFairSignUpStartTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("报名结束时间")
+    private Date jobFairSignUpEndTime;
+
     @ApiModelProperty("招聘会类型 1-线上 2-线下")
     private Integer jobFairType;
 
@@ -50,6 +70,12 @@ public class PublicJobFairDetail implements Serializable {
     @ApiModelProperty("经度")
     private BigDecimal longitude;
 
+    @ApiModelProperty("是否跨域")
+    private String isCrossDomain;
+
+    @ApiModelProperty("跨域联盟城市")
+    private String crossDomainCities;
+
     @ApiModelProperty("是否已报名 0-未报名 1-已报名")
     private Integer isSignUp;
 }