Merge branch 'open_gj' into 'master'

新增卫返回

See merge request !361
This commit is contained in:
2022-08-01 14:33:05 +08:00
@@ -234,6 +234,11 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
}catch(Exception e){
seawater.setHall(0);
}
try{
seawater.setToilet(source.getInt("toilet"));
}catch(Exception e){
seawater.setToilet(0);
}
try{
seawater.setpDate(source.getInt("p_date"));
}catch(Exception e){