Merge remote-tracking branch 'origin/master'

zhaowenxuan

2025-03-21 b7f0fb8eda40b6761b35a37f72eb5e8a3c836bed

Merge remote-tracking branch 'origin/master'

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java

@@ -240,8 +240,8 @@
//        tjFlowingWater.setPayStasus(1L);
        TjOrder order = orderService.getById(tjFlowingWater.getOrderId());

        if (order.getFinishTime() != null) {
            return AjaxResult.error("该人员已签离,不可补录项目!");
        if (order.getPrintLastTime() != null) {
            return AjaxResult.error("该人员报告已打印,不可补录项目!");
        }

        TjCustomer customer = customerService.getById(order.getUserId());