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

whycq

2023-03-14 b49472f96cd9b545036cdf28fb4e5111737b080e

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

@@ -18,7 +18,7 @@

    @Override
    public int getWorkingMast(Integer devpNo) {
        return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 6));
        return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 2));
    }

    @Override