From e42bbb438b21ad7ef01888b7172ee5f810d2ab39 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 06 四月 2021 01:42:57 +0800
Subject: [PATCH] fix(人力微服务): 修改前端，后端判断比较多，撤回上版本操作
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 4 ++--
.txlcn/FEBS-Server-System-8201.mv.db | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.txlcn/FEBS-Server-System-8201.mv.db b/.txlcn/FEBS-Server-System-8201.mv.db
index cb1f6f0..a03196e 100644
--- a/.txlcn/FEBS-Server-System-8201.mv.db
+++ b/.txlcn/FEBS-Server-System-8201.mv.db
Binary files differ
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index 13cdc89..560ce45 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -92,12 +92,12 @@
@FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告1-未报告 2-已报告")
@TableField("reportStatus")
@ExcelField(value = "是否已报告", writeConverterExp = "1=未报告,2=已报告")
- private Integer reportStatus = 1;
+ private Integer reportStatus = 0;
@FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 1-未申请 2-已申请")
@TableField("applayStatus")
@ExcelField(value = "状态", writeConverterExp = "1=未申请,2=已申请")
- private Integer applayStatus = 1;
+ private Integer applayStatus = 0;
@FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
@TableField("auditor")
--
Gitblit v1.8.0