Explorar el Código

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter hace 1 año
padre
commit
b9ff5ff1fd
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Ver fichero

@@ -907,7 +907,7 @@ public class WxRentContractController extends WxContractBaseController {
int years = integers.size();
//合同以什么日期来计算开始计租日期
if(rentContract.getRentStartType()!=null &&rentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
rentContract.setRentalStartDate(wxRentContract.getStartDate());
}
List<Date> yearList = wxRentContractService.getYearList(years, 12, rentContract.getRentalStartDate());
if (null != yearList && yearList.size() > 0) {


Cargando…
Cancelar
Guardar