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

lty

14 小时以前 4bb523147bc6e9fef20142d1389c893f97321e02

 src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java

@@ -94,7 +94,7 @@
                                        wrkMastSta1.setStaEnd(1028);
                                        break;
                                    } else {
                                        wrkMastSta1.setStaEnd(2021);
                                        wrkMastSta1.setStaEnd(2024);
                                        break;
                                    }
                                case 5: