合同-date

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java

@@ -66,7 +66,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
 	 */
 	@NotBlank(message = "签订类型不能为空")
 	@Length(max = 20, message = "签订类型不能超过20个字符")
-	@ExcelAttribute(name = "签订类型", isNotEmpty = true, errorInfo = "签订情况不能为空", maxLength = 20, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_SITUATION_TYPE)
+	@ExcelAttribute(name = "签订类型", isNotEmpty = true, errorInfo = "签订类型不能为空", maxLength = 20, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_SITUATION_TYPE)
 	@Schema(description = "签订类型（字典）", name = "situation")
 	private String situation;
 

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -255,7 +255,7 @@ public interface ErrorCodes {
 	// 该人员未在档，请核实
 	String ARCHIVES_IMPORT_EMP_NOT_EXISTS = "archives.import.emp.not.exists";
 	// 存在已减档的档案，禁止导入
-	String ARCHIVES_IMPORT_EMP_ERROR_STATUS_EXISTS = "archives.import.emp.error.status..exists";
+	String ARCHIVES_IMPORT_EMP_ERROR_STATUS_EXISTS = "archives.import.emp.error.status.exists";
 	// 身份证必填
 	String ARCHIVES_IMPORT_EMP_IDCARD_MUST = "archives.import.emp.idCard.must";
 	String ARCHIVES_IMPORT_EMP_EMPNAME_MUST = "archives.import.emp.empName.must";