修改注册接口-1.保存pc端sys_user和sys_user_role

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java

@@ -127,16 +127,4 @@ public class AppUser extends BaseEntity
 
     @ApiModelProperty("民族")
     private String nation;
-
-    @TableField(exist = false)
-    @ApiModelProperty("工作经历列表")
-    private List<UserWorkExperiences> experiencesList;
-
-    @TableField(exist = false)
-    @ApiModelProperty("公司联系人列表")
-    private List<CompanyContact> contactsList;
-
-    @TableField(exist = false)
-    @ApiModelProperty("技能列表")
-    private List<AppSkill> appSkillsList;
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java

@@ -0,0 +1,114 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 公司对象 company
+ * @author lishundong
+ * @date 2024-09-04
+ */
+@Data
+@ApiModel("公司")
+@TableName(value = "company")
+public class Company extends BaseEntity
+{
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "company_id",type = IdType.AUTO)
+    @ApiModelProperty("公司id")
+    private Long companyId;
+
+    @Excel(name = "单位名称")
+    @ApiModelProperty("单位名称")
+    private String name;
+
+    @Excel(name = "单位地点")
+    @ApiModelProperty("单位地点")
+    private String location;
+
+    @Excel(name = "主要行业")
+    @ApiModelProperty("主要行业")
+    private String industry;
+
+    @Excel(name = "单位规模 对应字典scale")
+    @ApiModelProperty("单位规模 对应字典scale")
+    private String scale;
+
+    @Excel(name = "信用代码")
+    @ApiModelProperty("信用代码")
+    private String code;
+
+    @Excel(name = "单位介绍")
+    @ApiModelProperty("单位介绍")
+    private String description;
+
+    @Excel(name = "性质")
+    @ApiModelProperty("性质")
+    private String nature;
+
+    @ApiModelProperty("招聘数量")
+    private Integer totalRecruitment;
+
+    @TableField(exist = false)
+    @ApiModelProperty("是否收藏")
+    private Integer isCollection;
+
+    @ApiModelProperty("所属用户id")
+    private Long userId;
+
+    @ApiModelProperty("营业执照Url")
+    private String businessLicenseUrl;
+
+    @ApiModelProperty("法人身份证复印件-正面")
+    private String idCardPictureUrl;
+
+    @ApiModelProperty("法人身份证复印件-反面")
+    private String idCardPictureBackUrl;
+
+    @ApiModelProperty("授权代理书")
+    private String powerOfAttorneyUrl;
+
+    @ApiModelProperty("联系人")
+    private String contactPerson;
+
+    @ApiModelProperty("联系人电话")
+    private String contactPersonPhone;
+
+    @ApiModelProperty("审核状态 0审核中 1审核通过 2审核未通过")
+    private Integer status;
+
+    @ApiModelProperty("审核未通过原因")
+    private String notPassReason;
+
+//    @TableField(exist = false)
+//    @ApiModelProperty("qiye")
+//    private Integer isCollection;
+
+    @TableField(exist = false)
+    @ApiModelProperty("企业联系人列表")
+    private List<CompanyContact> companyContactList;
+
+    @ApiModelProperty("注册地址")
+    private String registeredAddress;
+
+    @ApiModelProperty("是否异常")
+    private String isAbnormal;
+
+    @TableField(exist = false)
+    @ApiModelProperty("驳回时间")
+    private String rejectTime;
+
+    @ApiModelProperty("是否本地重点企业")
+    private String isImpCompany;
+
+    @ApiModelProperty("本地重点发展产业")
+    private String impCompanyType;
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java

@@ -1,11 +1,29 @@
 package com.ruoyi.common.core.domain.model;
 
+import com.ruoyi.common.core.domain.entity.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
 /**
  * 用户注册对象
  * 
  * @author ruoyi
  */
+@Data
 public class RegisterBody extends LoginBody
 {
 
+    @ApiModelProperty("工作经历列表")
+    private List<UserWorkExperiences> experiencesList;
+
+    @ApiModelProperty("技能列表")
+    private List<AppSkill> appSkillsList;
+
+    @ApiModelProperty("公司信息")
+    private Company company;
+
+    @ApiModelProperty("用户信息")
+    private AppUser appUser;
 }