Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂

gongchunyi

2026-07-07 72a32c227fdf10f34fe563a7de35169da5729eea

 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;