diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java index da2467f..60241fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java @@ -122,5 +122,11 @@ public class JProject{ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + + /** + * 文件json + */ + @ApiModelProperty("文件json") + private String fileJson; } diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml index ea6ce38..bad5cf8 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml @@ -23,6 +23,6 @@ and project_year = #{req.projectYear} - order by create_time,project_year desc + order by create_time desc ,project_year desc