guoshengxiong
c5b1d70097
Merge branch 'xjw_attendance' into uat
# Conflicts:
# pom.xml
# src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
# src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
# src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
# src/main/java/com/zhgd/xmgl/util/Fileutils.java
2025-07-23 15:02:15 +08:00
..
2025-06-09 14:15:02 +08:00
2025-07-23 15:02:15 +08:00
2023-09-15 14:51:12 +08:00
2023-02-16 15:28:15 +08:00
2025-06-09 14:15:02 +08:00
2025-06-09 14:15:02 +08:00