冲突修改

business/jxstore/cms/sku.go

@@ -392,9 +392,11 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
 	FROM sku_name t1
 	LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
 	LEFT JOIN sku_name_place_bind t3 ON t1.id = t3.name_id
+	LEFT JOIN price_refer_snapshot t4 ON t4.city_code = ? AND t4.snapshot_at = ? AND t4.sku_id = t2.id
 	WHERE t1.deleted_at = ?`
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
+		0, utils.Time2Date(time.Now().AddDate(0, 0, -1)),
 		utils.DefaultTimeValue,
 	}
 	if keyword != "" {