Merge branch 'develop' of git.ailuowan.com:zzw/lone-services into develop

services/water/internal/logic/addWarningLogic.go

@@ -39,7 +39,7 @@ func (l *AddWarningLogic) AddWarning(in *water.AddWarningRequest) (*water.Respon
 		return l.fail(utils.ErrorNoLoginInfo)
 	}
 	aTime, _ := utils.ParseDateOnly(in.Time)
-	info := dao.UsersCreate{
+	info := dao.WarningCreate{
 		HostCode: in.HostCode,
 		Content:  in.Content,
 		Type:     in.Type,

services/water/internal/logic/warningStatusLogic.go

@@ -29,7 +29,7 @@ func NewWarningStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *War
 	}
 }
 
-// 状态
+// WarningStatus 状态
 func (l *WarningStatusLogic) WarningStatus(in *water.WarningStatusRequest) (*water.Response, error) {
 	var v validator.WarningStatusValidator
 	if fail := l.checkParams(in, &v); fail != nil {

services/water/model/warning.go

@@ -18,6 +18,6 @@ func (m WarningModel) Init() WarningModel {
 	return m
 }
 
-func (m WarningModel) Create(data *dao.UsersCreate) error {
+func (m WarningModel) Create(data *dao.WarningCreate) error {
 	return m.Base.Create(data)
 }