Merge branch 'dev' into 'main'

Dev

See merge request !82

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -77,9 +77,9 @@
             set_up = #{setUp},
             label_id = #{labelId},
             unit_price = #{unitPrice},
-            rentalUnit = #{rental_unit},
+            rental_unit = #{rentalUnit},
             plane_graph_url = #{planeGraphUrl},
-            hire_status = #{hire_status}
+            hire_status = #{hireStatus}
         WHERE id = #{id}
     </update>