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

LSH

2023-08-28 bc64e9e55c22153ac194ef010c9349ce3783a1a8

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

@@ -24,7 +24,7 @@
    public StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo, Integer row1) {
        StaDesc staDesc = null;
        if(crnNo==2){
            Integer sourceStaNo = 0;
            Integer sourceStaNo = 204;
            switch (stnNo){
                case 100:
                    sourceStaNo = 104;