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

lsh

2 天以前 506eef53323dddf4fefd2873be1c65942dac19b2

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

@@ -42,7 +42,7 @@
        Integer wrkRgv1 = wrkMastStaMapper.wrkCount1();
        Integer wrkRgv2 = wrkMastStaMapper.wrkCount2();

        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>();
        Wrapper<StaDesc> wrapper = new EntityWrapper<>();

        // ✅ 如果 wrkRgv1 < wrkRgv2，则多加一个条件
        if (wrkRgv1 < wrkRgv2) {