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

whycq

2022-08-12 136d22c6c5810ed3e8e98727583a6a812d08ecd2

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