Merge remote-tracking branch 'origin/master'

server/api/v1/web/toilet.go

 package web
 
 import (
+	"fmt"
 	"gitee.com/zjlsliupei/ghelp"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/request"
@@ -29,7 +30,7 @@ func GetToiletList(c *gin.Context) {
 func GetToiletDetail(c *gin.Context) {
 	var arg request.GetId
 	_ = c.ShouldBindJSON(&arg)
-
+	fmt.Println(c.ShouldBindJSON(&arg))
 	if data, err := toiletService.GetToiletDetail(arg); err != nil {
 		response.FailWithMessage(err.Error(), c)
 	} else {

server/request/toilet.go

@@ -7,5 +7,5 @@ type Toilet struct {
 }
 
 type GetId struct {
-	ID string `json:"id"`
+	ID int `json:"id"`
 }

server/service/admin/qsh_partol.go

@@ -61,7 +61,7 @@ func (qshPartolService *QshPartolService) GetQshPartolInfoList(info adminReq.Qsh
 		db = db.Where("type = ?", info.Type)
 	}
 	if info.ToiletId != 0 {
-		db = db.Where("toilet_id = ?", info.Toilet)
+		db = db.Where("toilet_id = ?", info.ToiletId)
 	}
 	err = db.Count(&total).Error
 	if err != nil {