Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro

liyong

2026-05-12 a122cfc45d18b6e679029a88eb342e9081df6595

 src/main/java/com/ruoyi/staff/service/impl/StaffSchedulingServiceImpl.java

@@ -17,7 +17,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.math.BigDecimal;
import java.time.Duration;