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

mrzhssss

2022-09-21 ab7236cec2c94f7abfd36d4eb684a9baa7e9ee0a

 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));
    }
}