20181226客户现场修改问题

src/main/java/com/izouma/awesomeadmin/dao/BannerInfoMapper.xml

@@ -238,7 +238,7 @@
             </trim>
             ,
         </if>
-        id desc
+        id
     </select>
     <select id="queryAllBannerInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
         select <include refid="Base_Column_List"/> from banner_info
@@ -331,7 +331,7 @@
             ,
         </if>
 
-        id desc
+        id
     </select>
     <select id="queryBannerInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
         select <include refid="Base_Column_List"/> from banner_info

src/main/java/com/izouma/awesomeadmin/dao/FileInfoMapper.xml

@@ -9,7 +9,7 @@
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
         <result column="url" property="url" jdbcType="VARCHAR"/>
-        <result column="upload_time" property="uploadTime" jdbcType="VARCHAR"/>
+        <result column="upload_time" property="uploadTime" jdbcType="TIMESTAMP"/>
         <result column="type" property="type" jdbcType="INTEGER"/>
         <result column="father_id" property="fatherId" jdbcType="INTEGER"/>
     </resultMap>
@@ -105,7 +105,7 @@
                 #{url,jdbcType=VARCHAR},
             </if>
             <if test="uploadTime != null">
-                #{uploadTime,jdbcType=VARCHAR},
+                #{uploadTime,jdbcType=TIMESTAMP},
             </if>
             <if test="type != null">
                 #{type,jdbcType=INTEGER},
@@ -140,7 +140,7 @@
                 url= #{url,jdbcType=VARCHAR},
             </if>
             <if test="uploadTime != null">
-                upload_time= #{uploadTime,jdbcType=VARCHAR},
+                upload_time= #{uploadTime,jdbcType=TIMESTAMP},
             </if>
             <if test="type != null">
                 type= #{type,jdbcType=INTEGER},

src/main/java/com/izouma/awesomeadmin/model/FileInfo.java

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class FileInfo{
+public class FileInfo {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -15,7 +16,7 @@ public class FileInfo{
     private Date createTime;
     private String createUser;
     private String url;
-    private String uploadTime;
+    private Date uploadTime;
     private Integer type;
     private Integer fatherId;
     private ImgInfo imgInfo;
@@ -25,118 +26,119 @@ public class FileInfo{
 
     private String searchKey;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getUrl(){
+
+    public String getUrl() {
         return this.url;
     }
 
-    public void setUrl(String url){
+    public void setUrl(String url) {
         this.url = url;
     }
-    public String getUploadTime(){
-        return this.uploadTime;
-    }
 
-    public void setUploadTime(String uploadTime){
-        this.uploadTime = uploadTime;
-    }
-    public Integer getType(){
+    public Integer getType() {
         return this.type;
     }
 
-    public void setType(Integer type){
+    public void setType(Integer type) {
         this.type = type;
     }
-    public Integer getFatherId(){
+
+    public Integer getFatherId() {
         return this.fatherId;
     }
 
-    public void setFatherId(Integer fatherId){
+    public void setFatherId(Integer fatherId) {
         this.fatherId = fatherId;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
 
     public ImgInfo getImgInfo() {
         return imgInfo;
@@ -166,5 +168,12 @@ public void setIdStr(String idStr) {
         this.imgId = imgId;
     }
 
+    public Date getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(Date uploadTime) {
+        this.uploadTime = uploadTime;
+    }
 }