Commit 4777b804c2ff204264a4179bcaf2b63a4db77ee7

Authored by 潘钊
1 parent 05d85398

迁移到 24

src/main/java/com/bsth/server_ws/util/WSDataConver.java
... ... @@ -249,10 +249,16 @@ public class WSDataConver {
249 249 nh_waybillItem.setM_dblYH(oilInfo.getYh());
250 250 //加油地点1
251 251 nh_waybillItem.setM_strJYD1("");
  252 + //加油地点2
  253 + nh_waybillItem.setM_strJYD2("");
252 254 //加油工工号1
253 255 nh_waybillItem.setM_strJYG1("");
  256 + //加油工工号1
  257 + nh_waybillItem.setM_strJYG2("");
254 258 //油耗类型1
255 259 nh_waybillItem.setM_strYHLX1(oilInfo.getRylx());
  260 + //油耗类型2
  261 + nh_waybillItem.setM_strYHLX1("");
256 262 }
257 263  
258 264 nh_waybill.getM_SubInfos().add(nh_waybillItem);
... ...
src/main/resources/application.properties
1 1 spring.profiles: dev,prod
2   -spring.profiles.active: dev
  2 +spring.profiles.active: prod
3 3  
4 4 spring.view.suffix=.html
5 5 server.session-timeout=-1
... ...