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

Junjie

2023-05-26 ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673

 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