Merge branch 'dev_New_pro' into dev_克拉玛依市新聚工贸_pro

云

2026-08-26 b2da163832b4e665645d39a5ec3ece7209d75143

 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;