zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://124.243.245.42:2222/zkr/shz-backend

Browse Source
This commit is contained in:
lapuda
2026-07-22 10:47:25 +08:00
parent 4ca74d6079 5ffacded67
commit 3e1a23071a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@ public class Company extends BaseEntity
@ApiModelProperty("是否下架(0上架，1下架)") @ApiModelProperty("是否下架(0上架，1下架)")
private String companyStatus; private String companyStatus;
@ApiModelProperty("是否人力资源机构(0是,否)") @ApiModelProperty("是否人力资源机构(Y是,N否)")
private String isHrs; private String isHrs;
/** /**

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
View File

@@ -299,7 +299,7 @@ public class SsoService {
company.setRegisteredAddress(object.getString("entRegisteredAddress")); company.setRegisteredAddress(object.getString("entRegisteredAddress"));
company.setNature(object.getString("entType")); company.setNature(object.getString("entType"));
company.setDescription(object.getString("entIntro")); company.setDescription(object.getString("entIntro"));
// company.setIsHrs(object.getString("isServiceProvider").equals("Y")?"0":null);//是否是人力资源机构 company.setIsHrs(object.getString("isServiceProvider"));//是否是人力资源机构
// company.setScale(object.getString("entSize")); // company.setScale(object.getString("entSize"));
//添加联系人 //添加联系人
CompanyContact contact=new CompanyContact(); CompanyContact contact=new CompanyContact();