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

lty

昨天 8fe628e31d57f10f83b0c7b73aa4506e8d888c48

 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: