Merge remote-tracking branch 'origin/master'

huliguo

3 天以前 11ec7ac8f4832c4274cf61a19cc35cda3de9e0e5

 src/main/java/com/linghu/model/entity/Platform.java

@@ -7,6 +7,8 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;

@@ -21,49 +23,52 @@
         * 平台id
         */
        @TableId(type = IdType.AUTO)
        @ApiModelProperty("平台id")
        private Integer platform_id;

        /**
         * 类型id
         */
        @ApiModelProperty("类型id")
        private Integer type_id;

        /**
         * 平台名称
         */
        @ApiModelProperty("平台名称")
        private String platform_name;

        /**
         * 平台域名
         */
        @ApiModelProperty("平台域名")
        private String domain;

        /**
         * 
         */
        @ApiModelProperty("创建时间")
        @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS", timezone = "GMT+8")
        private LocalDateTime create_time;

        /**
         * 
         */
        @ApiModelProperty("创建者")
        private String create_by;

        /**
         * 
         */
        @ApiModelProperty("修改时间")
        @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS", timezone = "GMT+8")
        private LocalDateTime update_time;

        /**
         * 
         */
        @ApiModelProperty("创建者")
        private String update_by;

        /**
         * 0-未删除，1-已删除
         */
        private Integer del_flag;

        @TableField(exist = false)
        private static final long serialVersionUID = 1L;
@@ -95,9 +100,7 @@
                                && (this.getUpdate_time() == null ? other.getUpdate_time() == null
                                                : this.getUpdate_time().equals(other.getUpdate_time()))
                                && (this.getUpdate_by() == null ? other.getUpdate_by() == null
                                                : this.getUpdate_by().equals(other.getUpdate_by()))
                                && (this.getDel_flag() == null ? other.getDel_flag() == null
                                                : this.getDel_flag().equals(other.getDel_flag()));
                                                : this.getUpdate_by().equals(other.getUpdate_by()));
        }

        @Override
@@ -112,7 +115,6 @@
                result = prime * result + ((getCreate_by() == null) ? 0 : getCreate_by().hashCode());
                result = prime * result + ((getUpdate_time() == null) ? 0 : getUpdate_time().hashCode());
                result = prime * result + ((getUpdate_by() == null) ? 0 : getUpdate_by().hashCode());
                result = prime * result + ((getDel_flag() == null) ? 0 : getDel_flag().hashCode());
                return result;
        }

@@ -130,7 +132,6 @@
                sb.append(", create_by=").append(create_by);
                sb.append(", update_time=").append(update_time);
                sb.append(", update_by=").append(update_by);
                sb.append(", del_flag=").append(del_flag);
                sb.append(", serialVersionUID=").append(serialVersionUID);
                sb.append("]");
                return sb.toString();