Commit 814d2604 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4

parents cfb9c5a6 771df888
...@@ -2,10 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity; ...@@ -2,10 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.Data; import lombok.Data;
import lombok.ToString; import lombok.ToString;
...@@ -26,7 +23,7 @@ public class TBusinessEmployeeExtendInfo extends Model<TBusinessEmployeeExtendIn ...@@ -26,7 +23,7 @@ public class TBusinessEmployeeExtendInfo extends Model<TBusinessEmployeeExtendIn
/** /**
* 主键 * 主键
*/ */
@TableId @TableId(type = IdType.ASSIGN_ID)
private String id; private String id;
/** /**
......
...@@ -20,7 +20,7 @@ public class TSalaryStatisticsDepart implements Serializable { ...@@ -20,7 +20,7 @@ public class TSalaryStatisticsDepart implements Serializable {
/** /**
* 主键 * 主键
*/ */
@TableId @TableId(type = IdType.ASSIGN_ID)
private String id; private String id;
/** /**
* 部门名称 * 部门名称
......
...@@ -20,7 +20,7 @@ public class TSalaryStatisticsPersonal implements Serializable { ...@@ -20,7 +20,7 @@ public class TSalaryStatisticsPersonal implements Serializable {
/** /**
* 主键 * 主键
*/ */
@TableId @TableId(type = IdType.ASSIGN_ID)
private String id; private String id;
/** /**
* 电信工号 * 电信工号
......
package com.yifu.cloud.plus.v1.business.entity.system; package com.yifu.cloud.plus.v1.business.entity.system;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -29,7 +30,7 @@ public class TBusWarningEmployee extends Model<TBusWarningEmployee> { ...@@ -29,7 +30,7 @@ public class TBusWarningEmployee extends Model<TBusWarningEmployee> {
/** /**
* *
*/ */
@TableId @TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键", name = "id") @Schema(description = "主键", name = "id")
private Integer id; private Integer id;
/** /**
......
...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.business.entity.vacation; ...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.business.entity.vacation;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -22,7 +23,7 @@ public class TVacationRuleConfig extends Model<TVacationRuleConfig> { ...@@ -22,7 +23,7 @@ public class TVacationRuleConfig extends Model<TVacationRuleConfig> {
/** /**
* 主键 * 主键
*/ */
@TableId @TableId(type = IdType.ASSIGN_ID)
private Integer id; private Integer id;
/** /**
......
...@@ -925,7 +925,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -925,7 +925,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
TPaymentInfo paymentInfo; TPaymentInfo paymentInfo;
TSocialFundInfo socialInfo; TSocialFundInfo socialInfo;
TSocialInfo tSocialInfo = new TSocialInfo(); TSocialInfo tSocialInfo = null;
String temp; String temp;
int res; int res;
List<TSocialInfo> socialist; List<TSocialInfo> socialist;
...@@ -1560,7 +1560,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1560,7 +1560,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
String temp; String temp;
int res = -1; int res = -1;
List<TProvidentFund> fundlist; List<TProvidentFund> fundlist;
TProvidentFund tProvidentFund = new TProvidentFund(); TProvidentFund tProvidentFund = null;
List<TSettleDomainSelectVo> settleDomainR; List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo; R<TSettleDomainListVo> listVo;
...@@ -2101,7 +2101,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2101,7 +2101,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
TPaymentInfo payExists; TPaymentInfo payExists;
TSocialFundInfo socialInfo = null; TSocialFundInfo socialInfo = null;
TSocialInfo tSocialInfo = new TSocialInfo(); TSocialInfo tSocialInfo = null;
String temp; String temp;
List<TSocialInfo> socialist; List<TSocialInfo> socialist;
int res; int res;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment