Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/opp into dev

@@ -112,7 +112,6 @@ limit ?
 	sqlCount := fmt.Sprintf(`select count(0) from (
 select id,user_id,create_at,source_content from chance
 where user_id=? and company_id=? and review_status in (%v)
-order by create_at desc
 ) a left JOIN chance_data b on a.id =b.chance_id`, utils.JoinInt8s(reviewStatus, ","))
 	if err = utils.ExecuteQueryOne(&total, sqlCount, uid, cid); err != nil {
 		return

@@ -520,13 +520,16 @@ type CommonListItem struct {
 	ReviewStatus int `json:"reviewStatus"` //审核状态
 }
 type ChanceItem struct {
-	Id         int64         `json:"id"`
-	CreateTime int64         `json:"createTime"`
-	Provider   *BaseUserInfo `json:"provider"`
-	FormList   []*Form       `json:"formList" valid:"Required"`
-	Speechs    []Speech      `json:"speechs"`
-	Pictures   []Picture     `json:"pictures"`
-	Videos     []Video       `json:"videos"`
+	Id             int64         `json:"id"`
+	CreateTime     int64         `json:"createTime"`
+	CreateTimeCopy int64         `json:"createTimeCopy"`
+	UpdateTime     int64         `json:"updateTime"`
+	ApproveTime    int64         `json:"approveTime"`
+	Provider       *BaseUserInfo `json:"provider"`
+	FormList       []*Form       `json:"formList" valid:"Required"`
+	Speechs        []Speech      `json:"speechs"`
+	Pictures       []Picture     `json:"pictures"`
+	Videos         []Video       `json:"videos"`
 }
 type ChanceData struct {
 	ThumbsUpTotal int `json:"thumbsupTotal"` //点赞总数

@@ -151,3 +151,7 @@ func logMsg(msg *models.UserMsg, name string) {
 	log.Info(fmt.Sprintf("发送消息 消息类型:%v Receiver:%v(%v) Message:%v SourceId:%v SourceType:%v",
 		msg.MsgType, msg.ReceiveUserId, name, msg.Message, msg.SourceId, msg.SourceType))
 }
+
+func SaveApproveLog(orm orm.Ormer, code int, userId int64, param ...interface{}) (err error) {
+	return
+}

@@ -1210,6 +1210,7 @@ func MyApproveChance(header *protocol.RequestHeader, request *protocol.MyApprove
 				item := protocol.ChanceItem{
 					Id:       chance.ChanceId,
 					Provider: provider,
+					//CreateTime:chance.c
 					//CreateTime: chance.CreateTime.Unix() * 1000,
 				}
 				jsonUnmarshal(chance.SourceContent, &item.FormList)

@@ -89,7 +89,7 @@ func UploadFile(request *protocol.FileRequest) (rsp *protocol.FileResponse, err
 			log.Error(err)
 			return
 		}
-		rsp.Paths = append(rsp.Paths, filepath.Join(virtualPath, filename))
+		rsp.Paths = append(rsp.Paths, virtualPath+"/"+filename)
 		ResizeImage(request.FileType, sourcePath, prefix, subfix, f)
 	}
 	return