Merge remote-tracking branch 'origin/master'

mhotel/src/com/happy/dao/impl/HouseImplDao.java

@@ -33,8 +33,9 @@ public class HouseImplDao implements HouseDao {
 
     @Override
     public int insertHouse(House house) {
-        String sql = "INSERT INTO house (id, h_name, h_areas, price, number, h_config, remark, create_id, create_date, status) VALUES (:id, :h_name, :h_areas, :price, :number, :h_config, :remark, :create_id, :create_date, :status)";
+        String sql = "INSERT INTO house (id, manager_id, h_name, h_areas, price, number, h_config, remark, create_id, create_date, status) VALUES (:id, :manager_id, :h_name, :h_areas, :price, :number, :h_config, :remark, :create_id, :create_date, :status)";
         MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("manager_id",house.getManagerId());
         sps.addValue("h_name",house.gethName());
         sps.addValue("h_areas",house.gethAreas());
         sps.addValue("price",house.getPrice());