Merge branch 'feature/tmr-group' of baishaojie/tmrgo into develop

http/handle/api/user.go

@@ -49,6 +49,8 @@ func Auth(c *gin.Context) {
 	valid := validation.Validation{}
 	valid.MaxSize(reqInfo.Username, 100, "username").Message("最长为100字符")
 	valid.MaxSize(reqInfo.Password, 100, "password").Message("最长为100字符")
+	valid.MinSize(reqInfo.Password, 1, "password").Message("不能为空")
+	valid.MinSize(reqInfo.Password, 1, "password").Message("不能为空")
 	fmt.Println("==========reqInfo===========", reqInfo)
 	if valid.HasErrors() {
 		app.MarkErrors(valid.Errors)

module/group.go

@@ -407,10 +407,8 @@ func getMixedDetail(pastureId, feedFormulaId int32, startTime, endTime string) (
 		GROUP BY de.date ) tmp HAVING tmp.feed_formula_id = %d`, pastureId, startTime, endTime, feedFormulaId)
 	dataList := &models.MixedDetail{}
 	if _, err := restful.Engine.NewSession().SQL(sql).Get(dataList); err != nil {
-		fmt.Println("======MixedDetail===err=====", err)
 		return nil, err
 	}
-	fmt.Println("======MixedDetail===dataList=====", dataList)
 	return dataList, nil
 }
 
@@ -443,9 +441,7 @@ func getSprinkleDetail(pastureId, feedFormulaId int32, startTime, endTime string
 		pastureId, startTime, endTime, feedFormulaId)
 	dataList := &models.SprinkleDetail{}
 	if _, err := restful.Engine.NewSession().SQL(sql).Get(dataList); err != nil {
-		fmt.Println("======SprinkleDetail===err=====", err)
 		return nil, err
 	}
-	fmt.Println("======SprinkleDetail===dataList=====", dataList)
 	return dataList, nil
 }