Merge branch 'develop' into 'swagger'

# Conflicts:
#   controllers/gdd_controller.go

changelog/1.0.4.yaml

+author: tgsiegel
+change_type: Chore
+commit: swagger updates
+date: '2023-03-16'
+merge_request: https://gitlab.cs.umd.edu/dawn/go-backend/dawn-gdd/-/merge_requests/25
+version: 1.0.4

controllers/gdd_controller.go

@@ -21,6 +21,10 @@ var GetGddValues = services.GetGddValues
 // @Failure 400 {object} errors.StandardError
 // @Failure 404 {object} errors.StandardError
 // @Failure 500 {object} errors.StandardError
+<<<<<<< controllers/gdd_controller.go
+=======
+// @Param year query int true "Year to get gdd for"
+>>>>>>> controllers/gdd_controller.go
 // @Param product query string true "Crop to calculate gdd for" Enums(corn)
 // @Param latitude query number true "Latitude to search for"
 // @Param longitude query number true "Longitude to search for"