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

liyong

2026-05-22 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28

 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;