Explorar el Código

fix

release_toaliyun_real
winter hace 2 años
padre
commit
5baf4c87da
Se han modificado 8 ficheros con 8 adiciones y 8 borrados
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java
  3. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java
  4. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  5. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java
  6. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java
  7. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  8. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java Ver fichero

@@ -85,7 +85,7 @@ public class WxBillDailyController extends BillBaseController {
wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
}
}
wxBillDaily.setSortColumns("starttime desc , merchant_id desc");
wxBillDaily.setSortColumns("status asc,starttime desc , merchant_id desc");
final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java Ver fichero

@@ -65,7 +65,7 @@ public class WxBillDepositController extends BillBaseController {
}
}
wxBillDeposit.setSortColumns("starttime desc , merchant_id desc");
wxBillDeposit.setSortColumns("status asc,starttime desc , merchant_id desc");
final PageInfo<WxBillDeposit> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java Ver fichero

@@ -63,7 +63,7 @@ public class WxBillOtherController extends BillBaseController {
}
}
wxBillOther.updateTenantInfo(getTenantInfo());
wxBillOther.setSortColumns("starttime desc , merchant_id desc");
wxBillOther.setSortColumns("status asc, starttime desc , merchant_id desc");
final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java Ver fichero

@@ -63,7 +63,7 @@ public class WxBillOtherDepositController extends BillBaseController {
}
}
wxBillOtherDeposit.updateTenantInfo(getTenantInfo());
wxBillOtherDeposit.setSortColumns("starttime desc , merchant_id desc");
wxBillOtherDeposit.setSortColumns("status asc, starttime desc , merchant_id desc");
final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java Ver fichero

@@ -65,7 +65,7 @@ public class WxBillPropertyController extends BillBaseController {
wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
}
}
wxBillProperty.setSortColumns("starttime desc , merchant_id desc");
wxBillProperty.setSortColumns("status asc,starttime desc , merchant_id desc");
PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize);
return new ResultData(result);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java Ver fichero

@@ -66,7 +66,7 @@ public class WxBillPropertyDepositController extends BillBaseController {
}
}
wxBillPropertyDeposit.setSortColumns("starttime desc , merchant_id desc");
wxBillPropertyDeposit.setSortColumns("status asc, starttime desc , merchant_id desc");
PageInfo<WxBillPropertyDeposit> result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize);
return new ResultData(result);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java Ver fichero

@@ -65,7 +65,7 @@ public class WxBillRentController extends BillBaseController {
}
}
wxBillRent.setSortColumns("starttime desc , merchant_id desc");
wxBillRent.setSortColumns("status asc, starttime desc , merchant_id desc");
final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java Ver fichero

@@ -66,7 +66,7 @@ public class WxBillRentManageController extends BillBaseController {
wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
}
}
wxBillRentManage.setSortColumns("starttime desc , merchant_id desc");
wxBillRentManage.setSortColumns("status asc,starttime desc , merchant_id desc");
final PageInfo<WxBillRentManage> page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize);
return new ResultData(page);
}


Cargando…
Cancelar
Guardar