Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

20 小时以前 e099d0cd93c26b44bc1c10e51944edfad0465b0c

 src/main/java/com/ruoyi/projectManagement/pojo/Roles.java

@@ -38,10 +38,6 @@
    @ApiModelProperty(value="状态(1:启用, 0:禁用)")
    private Integer status;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;