Merge branch 'release/3.0.2.2504.01' into release/个税&业务线

# Conflicts: # resource/WEB-INF/prop/hrmSalary.properties
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
2026-01-29 10:45:06 +08:00 · 2026-01-29 10:43:55 +08:00 · 2026-01-29 10:43:42 +08:00 · 2026-01-16 14:42:43 +08:00
2 changed files with 2 additions and 2 deletions
--- a/resource/WEB-INF/prop/hrmSalary.properties
+++ b/resource/WEB-INF/prop/hrmSalary.properties
@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=3.0.2.2510.01.t
+version=3.0.3.2510.01.t
 openFormulaForcedEditing=false
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldSettingServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldSettingServiceImpl.java
@ -57,7 +57,7 @@ public class AttendQuoteFieldSettingServiceImpl extends Service implements Atten
    @Override
    public List<AttendQuoteFieldSettingListDTO> list(AttendQuoteFieldSettingQueryParam queryParam) {
        //同步字段
-        getAttendQuoteFieldService(user).syncAttendFields();
+//        getAttendQuoteFieldService(user).syncAttendFields();
        // 获取字段设置
        List<AttendQuoteFieldSettingPO> list = biz.getAttendQuoteFieldSetting(queryParam.getSourceType());
Author	SHA1	Message	Date
钱涛	37b42e75b9	Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 # Conflicts: # resource/WEB-INF/prop/hrmSalary.properties	2026-01-29 10:45:06 +08:00
钱涛	1f910b28d3	Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01	2026-01-29 10:43:55 +08:00
钱涛	dee4e13c6c	考勤引用设置字段时取消引用考勤	2026-01-29 10:43:42 +08:00
钱涛	3b772e0f91	Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 # Conflicts: # resource/WEB-INF/prop/hrmSalary.properties	2026-01-16 14:42:43 +08:00