Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

whycq

2023-09-06 9323f1e6cf66551371948bed0e734ec9b7a545d5

 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java

@@ -29,6 +29,6 @@

    @Override
    public int getOutToStn182(Integer devpNo) {
        return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).eq("wrk_sts",12));
        return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
    }
}