Merge remote-tracking branch 'origin/master'

2021-09-23 16:12:54 +08:00
parent 1f0f31c8f3 cfc70464c2
commit 6d284d9837
14 changed files with 741 additions and 67 deletions
@@ -50,7 +50,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 								   HttpServletRequest req) {
 		QueryWrapper<PayMailBillList> queryWrapper = QueryGenerator.initQueryWrapper(payMailBillList, req.getParameterMap());
 		Page<PayMailBillList> page = new Page<>(pageNo, pageSize);
-		queryWrapper.orderByDesc("create_time");
+		queryWrapper.orderByDesc("pc.create_time");
 		IPage<PayMailBillList> pageList = payMailContractService.pageContract(page, queryWrapper);
 		return Result.OK(pageList);
 	}