--no commit message

app/live/src/main/java/com/zrqx/live/bg/controller/LiveController.java

@@ -142,7 +142,7 @@ public class LiveController {
 	@GetMapping("/page")
 	public CallBack<PageInfo<LiveVo>> page(PageParam pageParam, LiveForm form){
 		if(StringUtils.isBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy("createTime desc");
+			pageParam.setOrderBy("uploadTime desc");
 		}
 		return CallBack.success(liveService.page(pageParam,form));
 	}

app/live/src/main/java/com/zrqx/live/bg/mapper/LiveDiyTypeMapper.java

 package com.zrqx.live.bg.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
+
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.live.commons.model.LiveDiyType;
 /**
  * 直播库和自定义分类
  */
+@Mapper
 public interface LiveDiyTypeMapper extends BaseMapper<LiveDiyType> {
 
 }

app/live/src/main/java/com/zrqx/live/bg/mapper/LiveMapper.java

@@ -15,7 +15,7 @@ import com.zrqx.live.commons.vo.LiveVo;
 public interface LiveMapper extends BaseMapper<Live>{
 
 	@Select("<script>"
-			+ " select id,name,realPrice, DATE_FORMAT(a.uploadTime,'%Y-%m-%d %H:%i') uploadTime,status,liveStatus,img,whId "
+			+ " select id,name,realPrice, DATE_FORMAT(uploadTime,'%Y-%m-%d %H:%i') uploadTime,status,liveStatus,img,whId "
 			+ " from l_live where 1=1 "
 			+ " eq(liveStatus,form.liveStatus) "
 			+ " eq(model,form.model) "

app/live/src/main/java/com/zrqx/live/commons/vo/LiveVo.java

@@ -13,7 +13,7 @@ public class LiveVo {
 	@ApiModelProperty("售价")
 	private String realPrice;
 	@ApiModelProperty("创建时间")
-	private String createTime;
+	private String uploadTime;
 	@ApiModelProperty("状态")
 	private String status;
 	private String  statusZh;;