- * - *
- * - * @author - * @since - */ - -@Data -@Accessors(chain = true) -@TableName("meeting") -public class Meeting implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @TableField("`name`") - private String name; - - @TableField("`code`") - private String code; - - @TableField("description") - private String description; - - /** - * 0.未开始 1.进行中 2已结束,3暂缓中 - */ - @TableField("stage") - private Integer stage; - - /** - * 0:禁,1可 - */ - @TableField("`status`") - private Integer status; - - @TableField("address") - private String address; - - /** - * 0私有1公开 - */ - @TableField("`show`") - private Integer show; - - - /** - * 预计开始时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") - @TableField("start_date") - private LocalDateTime startDate; - - /** - * 预计结束时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") - @TableField("end_date") - private LocalDateTime endDate; - - /** - * 实际开始时间 - */ - @TableField("real_start_date") - private LocalDateTime realStartDate; - - /** - * 实际结束时间 - */ - @TableField("real_end_date") - private LocalDateTime realEndDate; - - @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") - @TableField(value = "create_time" ,fill = FieldFill.INSERT ) - private LocalDateTime createTime; - - @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE) - private LocalDateTime updateTime; - - @TableField(value = "create_user" ,fill = FieldFill.INSERT) - private Long createUser; - - - - -} \ No newline at end of file diff --git a/xiaocool-api/common/src/main/java/entity/MeetingMember.java b/xiaocool-api/common/src/main/java/entity/MeetingMember.java deleted file mode 100644 index 58cd73fe..00000000 --- a/xiaocool-api/common/src/main/java/entity/MeetingMember.java +++ /dev/null @@ -1,61 +0,0 @@ -package entity; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.time.LocalDateTime; - -@ApiModel(value = "MajorVO", description = "展示用") -@Data -public class MeetingMember implements Serializable { - //user表 - private Long uid; - private String username; - private String password; - private Integer faceAuthentication; - private String faceImage; - private String uname; - private String role; - private Integer sex;//0女 1男 - private String email; - private String avatar;//头像 - private String telephone;//电话号码 - private String hobby;//爱好 - private String profile; - //userdetail - private Long udid; - private Integer participateStatus; - @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") - private LocalDateTime signInDate; - @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") - private LocalDateTime signOutDate; - private Long userId; - private Long meetingId; - private Long checkStatus; - private String signAdress; - private String supplementarySign; - - //meeting - private Long id; - private String mname; - private String code; - private String description; - private Integer stage; - private Integer status; - private String address; - private Integer show; - private LocalDateTime startDate; - private LocalDateTime endDate; - private Long createUser; - - @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - -} diff --git a/xiaocool-api/common/src/main/java/entity/Menu.java b/xiaocool-api/common/src/main/java/entity/Menu.java deleted file mode 100644 index 4cc1a7bd..00000000 --- a/xiaocool-api/common/src/main/java/entity/Menu.java +++ /dev/null @@ -1,47 +0,0 @@ -package entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import java.io.Serializable; -import java.util.List; - -@Getter -@Setter -@TableName("sys_menu") -@ApiModel(value = "Menu对象", description = "") -public class Menu implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty("名称") - private String name; - - @ApiModelProperty("路径") - private String path; - - @ApiModelProperty("图标") - private String icon; - - @ApiModelProperty("描述") - private String description; - - @TableField(exist = false) - private List