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

..

controller

Merge branch 'xjw_attendance' into uat

2025-07-23 15:02:15 +08:00

entity

管控bug修改

2025-07-22 18:08:32 +08:00

enums

代码规范

2024-07-11 16:18:15 +08:00

mapper

Merge branch 'xjw_attendance' into uat

2025-07-23 15:02:15 +08:00

service

Merge branch 'xjw_attendance' into uat

2025-07-23 15:02:15 +08:00