Merge remote-tracking branch 'origin/CLDC-2010-discounted-income-soft-max' into CLDC-2010-discounted-income-soft-max

# Conflicts:
#	db/schema.rb

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_03_31_094840) do
+ActiveRecord::Schema[7.0].define(version: 2023_04_05_132300) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -287,7 +287,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_31_094840) do
     t.string "town_or_city"
     t.string "county"
     t.integer "carehome_charges_value_check"
-    t.integer "status_cache", default: 0, null: false
     t.index ["bulk_upload_id"], name: "index_lettings_logs_on_bulk_upload_id"
     t.index ["created_by_id"], name: "index_lettings_logs_on_created_by_id"
     t.index ["location_id"], name: "index_lettings_logs_on_location_id"