Merge remote-tracking branch 'origin/dev_aeolus' into test

Controller/RentController.py

@@ -362,7 +362,7 @@ def rent_money_refund():
     rent = rent_info.Rent
     production = rent_info.Production
 
-    new_total = time_price[-1]
+    new_total = int(time_price[-1])
     refund_money = production.total - new_total
     if refund_money <= 0:
         return jsonify(REFUND_MONEY_IS_ZERO)