Merge branch 'dev' into test

@@ -197,7 +197,7 @@ func (productRecordService *ProductRecordService) ListProductCapacities(operateI
 			ProductName:     v.ProductRecordInfo.PlanProductName,
 			ProductName:     v.ProductRecordInfo.PlanProductName,
 			WorkerOn:        v.ProductRecordInfo.WorkOn,
 			WorkerOn:        v.ProductRecordInfo.WorkOn,
 			ProductWeigh:    v.ProductRecordInfo.Weigh,
 			ProductWeigh:    v.ProductRecordInfo.Weigh,
-			CreatedAt:       v.CreatedAt.Format("2006-01-02"),
+			CreatedAt:       v.CreatedAt.Local().Format("2006-01-02"),
 			ApproveStatus:   v.ProductRecordInfo.ApproveStatus,
 			ApproveStatus:   v.ProductRecordInfo.ApproveStatus,
 		}
 		}
 		result = append(result, item)
 		result = append(result, item)

@@ -294,7 +294,7 @@ func (srv ProductTroubleService) ListProductTrouble(param *query.ListProductTrou
 			SectionId:         v.WorkStation.SectionId,
 			SectionId:         v.WorkStation.SectionId,
 			SectionName:       v.WorkStation.SectionName,
 			SectionName:       v.WorkStation.SectionName,
 			Remark:            v.Remark,
 			Remark:            v.Remark,
-			ProductDate:       v.RecordDate.Format("2006-01-02"),
+			ProductDate:       v.RecordDate.Local().Format("2006-01-02"),
 			AmountLoss:        v.AmountLoss,
 			AmountLoss:        v.AmountLoss,
 			Types:             v.GetTypesName(),
 			Types:             v.GetTypesName(),
 			WorkerId:          v.ProductWorker.UserId,
 			WorkerId:          v.ProductWorker.UserId,

@@ -125,7 +125,7 @@ func (repo *ProductTroubleRepository) Find(queryOptions map[string]interface{})
 		query.Where(fmt.Sprintf(`product_worker->>'userName' like '%%%v%%'`, v))
 		query.Where(fmt.Sprintf(`product_worker->>'userName' like '%%%v%%'`, v))
 	}
 	}
 
 
-	query.Order("id", "DESC")
+	query.Order("id DESC")
 	cnt, err := query.SelectAndCount()
 	cnt, err := query.SelectAndCount()
 	if err != nil {
 	if err != nil {
 		return 0, nil, err
 		return 0, nil, err