Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

6 天以前 e5c29d6ac2b210a9385723598d79a42ae5a9679e

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml

@@ -444,7 +444,7 @@
        IF(plan_state = 1, 1,
            IF(executing_state = 3, 5,
                IF(NOW() < plan_start_time, 2,
                  IF(NOW() > plan_stop_time, 3, 4)
                  IF(NOW() < plan_stop_time, 3, 4)
                )
            )
    ) AS planState