Merge branch 'dev'

101captain

2022-03-23 2d0487d82ff61219c71155699b52d8d339a2443a

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java

@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -56,6 +57,7 @@
    /**
     * 转正时间
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private Date employmentTime;

    /**