290 Commits

Author	SHA1	Message	Date
钱涛	ec5463c050	Merge branch 'release/2.14.2.2405.02' into release/个税版本 ... # Conflicts: # src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml # src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java	2024-05-27 10:37:39 +08:00
钱涛	2cd255136d	版本	2024-05-23 16:13:47 +08:00
钱涛	43db025d98	Merge branch 'feature/账套副本' into release/2.14.2.2405.02	2024-05-23 11:36:38 +08:00
钱涛	79cfa0cbc0	删除往期累计多余项目 ... 往期累计别名设置	2024-05-21 10:50:17 +08:00
钱涛	3dc8f6d57c	Merge branch 'release/2.14.1.2405.01' into release/个税版本	2024-05-20 09:56:12 +08:00
钱涛	4c3b34e376	sql	2024-05-17 15:41:15 +08:00
钱涛	6de3b1454d	获取档案信息sql	2024-05-16 14:06:38 +08:00
钱涛	af819896e4	版本	2024-05-14 13:45:03 +08:00
钱涛	04978dd8e6	Merge branch 'release/2.14.1.2405.01' into release/个税版本	2024-05-13 14:01:22 +08:00
钱涛	e7dee966d6	二开说明	2024-05-09 17:27:28 +08:00
钱涛	bcc1e35117	拦截核算记录样例	2024-05-08 17:28:43 +08:00
钱涛	ec27cf5a08	Merge branch 'release/2.13.1.2404.02' into release/个税版本 ... # Conflicts: # src/com/engine/salary/service/AddUpDeductionService.java # src/com/engine/salary/wrapper/AddUpDeductionWrapper.java	2024-05-08 11:17:40 +08:00
钱涛	def5bae707	账套快照-隐藏字段脚本	2024-05-07 16:41:12 +08:00
钱涛	3428de9e33	账套快照	2024-05-06 16:03:29 +08:00
钱涛	4682866674	档案sql	2024-04-25 14:25:40 +08:00
钱涛	0661406c97	Merge branch 'release/2.13.1.2404.02' into release/个税版本 ... # Conflicts: # src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java	2024-04-25 11:47:47 +08:00
钱涛	d802d890d6	处理解密问题	2024-04-25 11:45:37 +08:00
钱涛	591555fa8a	更新sql	2024-04-23 17:47:02 +08:00
钱涛	1c2f0f516a	删除重复sql	2024-04-23 11:39:41 +08:00
钱涛	8f76daf0d1	Merge branch 'feature/外籍人员' into release/个税版本	2024-04-23 11:15:37 +08:00
钱涛	794ed55c7d	版本	2024-04-22 15:03:28 +08:00
钱涛	68d0003f62	新增核算结果的代理	2024-04-16 16:05:42 +08:00
钱涛	0e6449e1e2	外籍人员	2024-04-12 17:46:53 +08:00
Harryxzy	a9dd2c2cb3	Merge branch 'release/2.12.1.2403.02' into release/个税版本	2024-04-08 15:53:13 +08:00
Harryxzy	4ccfac80f5	sql	2024-04-01 16:33:13 +08:00
钱涛	5f64acc269	Merge branch 'release/2.12.1.2403.02' into release/个税版本 ... # Conflicts: # src/com/engine/salary/mapper/datacollection/EmployMapper.java # src/com/engine/salary/mapper/datacollection/EmployMapper.xml # src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java # src/com/engine/salary/service/ExtEmpService.java # src/com/engine/salary/service/SalaryEmployeeService.java # src/com/engine/salary/service/impl/ExtEmpServiceImpl.java # src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java	2024-03-29 14:37:00 +08:00
钱涛	2a692b13b4	外籍人员v1	2024-03-29 10:44:55 +08:00
钱涛	68b4d29c40	修改版本号	2024-03-18 09:54:59 +08:00
钱涛	3a79ed9574	Merge branch 'release/2.11.2.2403.01' into release/个税版本 ... # Conflicts: # src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java # src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java # src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java	2024-03-15 15:44:15 +08:00
钱涛	80510c8cfc	修改版本号	2024-03-15 10:20:38 +08:00
Harryxzy	a1c6d6ba52	Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01	2024-03-15 09:33:22 +08:00
Harryxzy	c3800881bc	sql	2024-03-15 09:31:04 +08:00
钱涛	452d7bc57c	Merge branch 'release/3.0.0.2403.01' into release/个税版本 ... # Conflicts: # src/com/engine/salary/entity/datacollection/AddUpSituation.java # src/com/engine/salary/entity/salarysob/po/SalarySobPO.java # src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java # src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java # src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java # src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java # src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java	2024-03-12 18:56:12 +08:00
钱涛	bef1835c39	jar更新	2024-03-12 16:46:55 +08:00
钱涛	e22e178d08	去除非标准功能	2024-03-12 14:51:28 +08:00
钱涛	9ec3581533	elog配置	2024-03-12 14:42:12 +08:00
钱涛	72861b9a93	Merge branch 'release/3.0.0.2403.01' into release/个税版本	2024-03-07 16:57:03 +08:00
钱涛	e81937c4dd	去除报表原先的表	2024-03-07 11:45:26 +08:00
钱涛	5a9d45f92b	Merge branch 'release/2.11.1.2402.01' into release/个税版本 ... # Conflicts: # resource/WEB-INF/prop/hrmSalaryCustom.properties # src/com/engine/salary/entity/datacollection/AddUpSituation.java # src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java # src/com/engine/salary/entity/salarysob/po/SalarySobPO.java # src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java # src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java # src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java # src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java # src/com/engine/salary/service/impl/SalarySendServiceImpl.java # src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java # src/com/engine/salary/service/impl/SalarySobServiceImpl.java # src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java # src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java # src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java # src/com/engine/salary/util/page/SalaryPageUtil.java	2024-03-06 15:54:07 +08:00
钱涛	cb005d717a	添加wiki目录	2024-03-05 17:40:10 +08:00
钱涛	c2eab7ce64	添加wiki目录	2024-03-05 17:37:47 +08:00
钱涛	fc807ae005	版本	2024-03-05 15:43:16 +08:00
钱涛	1c62be09d1	Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01	2024-03-05 13:58:50 +08:00
钱涛	93a77fdb6f	日志包添加锁	2024-03-04 16:04:17 +08:00
钱涛	c081581ba7	Merge branch 'feature/报表支持账套筛选' into release/2.11.1.2402.01	2024-03-04 14:01:33 +08:00
钱涛	022b904581	添加账套筛选条件sql	2024-02-28 14:54:13 +08:00
钱涛	4b77af983a	分页jar	2024-02-28 13:40:05 +08:00
钱涛	2edb98475b	更新日志版本	2024-02-27 15:43:36 +08:00
钱涛	f11d6a035c	去除pagehelper jar包	2024-02-26 15:40:52 +08:00
钱涛	53806d9262	Merge branch 'release/2.10.1.2401.01' into release/个税版本 ... # Conflicts: # src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java # src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java # src/com/engine/salary/util/excel/ExcelUtil.java	2024-02-21 15:28:33 +08:00