Merge remote-tracking branch 'origin/master'

sunty

2019-11-01 712ef81c6b8813a498a66cf61ffcd37e5c502c8c

 controllers/fileController.go

@@ -298,7 +298,7 @@
      logger.Debug("comp videoPersons.len:",len(videopersons))
      for _,vp :=range videopersons {
         isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
         bi := make([]DbPersonVo,0)
         var bi []DbPersonVo
         for _,p :=range vp.BaseInfo {
            bi = append(bi, DbPersonVo{
               PersonId: p.PersonId,
@@ -310,7 +310,7 @@
               PhoneNum: p.PhoneNum,
               Sex: p.Sex,
               TableId: p.TableId,
               BwType: strconv.Itoa(int(p.BwType)),
               BwType: p.BwType,
               TableName: p.TableName,
            })
         }