From fa6c013c7085cb252bcb4903bdfa8e97f2de11cc Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Sat, 23 Sep 2023 19:58:00 +0800 Subject: [PATCH] update --- .../hdl/enterprise_manage/hdl_central_kitchen_for_school.go | 2 +- app/db/db_central_kitchen_for_school_user_with_day.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go b/app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go index 9eceaf8..ddfe73a 100644 --- a/app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go +++ b/app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go @@ -1016,7 +1016,7 @@ func CentralKitchenForSchoolReserveDetail(c *gin.Context) { return } - var m []*db.CentralKitchenForSchoolUserRefundDayWithCentralKitchenForSchoolUserWithDay + var m []*db.CentralKitchenForSchoolUserWithDayWithCentralKitchenForSchoolUserRefundDay err = db.Db.Where("central_kitchen_for_school_user_with_day.ord_no =?", centralKitchenForSchoolPackageOrdForReserve.OutTradeNo). Where("central_kitchen_for_school_user_with_day.date >=? and central_kitchen_for_school_user_with_day.date <=?", centralKitchenForSchoolPackageOrdForReserve.MealTimeStart, centralKitchenForSchoolPackageOrdForReserve.MealTimeEnd). Join("LEFT", "central_kitchen_for_school_user_refund_day", "central_kitchen_for_school_user_refund_day.records_id = central_kitchen_for_school_user_with_day.id"). diff --git a/app/db/db_central_kitchen_for_school_user_with_day.go b/app/db/db_central_kitchen_for_school_user_with_day.go index d6da731..6c02ae9 100644 --- a/app/db/db_central_kitchen_for_school_user_with_day.go +++ b/app/db/db_central_kitchen_for_school_user_with_day.go @@ -39,7 +39,7 @@ func (centralKitchenForSchoolUserWithDayDb *CentralKitchenForSchoolUserWithDayDb } func (centralKitchenForSchoolUserWithDayDb *CentralKitchenForSchoolUserWithDayDb) FindCentralKitchenForSchoolUserWithDayByOrdNo(ordNo string) ([]map[string]interface{}, error) { - var m []*CentralKitchenForSchoolUserRefundDayWithCentralKitchenForSchoolUserWithDay + var m []*CentralKitchenForSchoolUserWithDayWithCentralKitchenForSchoolUserRefundDay if err := centralKitchenForSchoolUserWithDayDb.Db.Where("central_kitchen_for_school_user_with_day.ord_no =?", ordNo). Join("LEFT", "central_kitchen_for_school_user_refund_day", "central_kitchen_for_school_user_refund_day.records_id = central_kitchen_for_school_user_with_day.id"). Desc("central_kitchen_for_school_user_refund_day.id").