Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into tzq

src/main/java/cn/timer/api/bean/yggl/YgglAttaSbgjj.java

@@ -51,5 +51,6 @@ public class YgglAttaSbgjj extends Model<YgglAttaSbgjj> {
 	@ApiModelProperty(value="个人公积金帐号 ",example="OH81889257")
     private String grgjjzh;
     
-
+	@ApiModelProperty(value="组织机构代码 ",example="117")
+    private Integer orgCode;
 }
\ No newline at end of file

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -8,10 +8,14 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -130,7 +134,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="101")
     private Integer jobType;
     
-	@ApiModelProperty(value="员工状态 1试用、2正式、3离职中、4已离职",example="101")
+	@ApiModelProperty(value="员工状态 1正式、2试用、3离职中、4已离职",example="101")
     private Integer jobStatus;
     
 	@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")

src/main/java/cn/timer/api/controller/yggl/YgglController.java.rej

+diff a/src/main/java/cn/timer/api/controller/yggl/YgglController.java b/src/main/java/cn/timer/api/controller/yggl/YgglController.java	(rejected hunks)
+@@ -76,6 +76,7 @@
+ import cn.timer.api.dto.yggl.YgQueryDto;
+ import cn.timer.api.dto.yggl.YgglCartogramDto;
+ import cn.timer.api.dto.yggl.YgjgDto;
++import cn.timer.api.dto.yggl.YgmzDto;
+ import cn.timer.api.dto.yggl.YgProDto;
+ import cn.timer.api.dto.yggl.YgzzDto;
+ import cn.timer.api.utils.Md5;

src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java

@@ -51,4 +51,8 @@ public class AddygdaDto extends Page implements Serializable{
 	
 	@ApiModelProperty(value="性别 0：男；1：女",example="0")
     private Integer sex;
+	
+	
+	
+	
 }

src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java

@@ -8,6 +8,8 @@ package cn.timer.api.dto.yggl;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 import cn.timer.api.utils.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -55,7 +57,7 @@ public class YgQueryDto extends Page implements Serializable{
 	@ApiModelProperty(value="部门id",example="101")
 	private Integer bmgwid;
 	
-	@ApiModelProperty(value="员工状态1试用、2正式、3离职中、4已离职",example="2")
+	@ApiModelProperty(value="员工状态1正式、2试用、3离职中、4已离职",example="2")
 	private Integer jobStatus;
 	
 	@ApiModelProperty(value="手机号、姓名",example="1388888888 or 张三")

src/main/java/cn/timer/api/dto/yggl/YgjgDto.java

@@ -38,6 +38,10 @@ public class YgjgDto implements Serializable {
 	
 	@Transient
 	@TableField(exist = false)
+	private String cityname;
+	
+	@Transient
+	@TableField(exist = false)
 	private String jgname;
 	
 }