 钱涛
|
b99ce85dd9
|
Merge branch 'custom/领悦' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/VariableArchiveService.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-10-22 09:44:34 +08:00 |
Harryxzy
|
dd7905ac1c
|
Merge branch 'release/2.16.1.2410.01' into custom/领悦
|
2024-10-21 18:05:27 +08:00 |
|
钱涛
|
641b085a28
|
单元格锁定sql
|
2024-10-17 18:53:37 +08:00 |
|
钱涛
|
cede931b0d
|
版本
|
2024-10-17 14:21:46 +08:00 |
|
Harryxzy
|
c9ce2ae499
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
|
2024-10-12 16:39:18 +08:00 |
|
钱涛
|
64ac30c05f
|
自定义列全局设置
|
2024-10-11 15:34:17 +08:00 |
|
钱涛
|
da4e908a7d
|
模板sql
|
2024-10-10 14:16:57 +08:00 |
|
钱涛
|
9c155ff50c
|
Merge branch 'feature/权限' into custom/领悦业务线
|
2024-09-27 17:55:43 +08:00 |
|
钱涛
|
4b60c83df2
|
出去多余sql字段
|
2024-09-27 10:02:22 +08:00 |
|
钱涛
|
63f6dc6c0a
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-26 19:23:43 +08:00 |
|
钱涛
|
053282b40d
|
Merge branch 'feature/权限' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
|
2024-09-26 17:21:20 +08:00 |
|
钱涛
|
8803052577
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
|
2024-09-26 17:20:07 +08:00 |
|
钱涛
|
7d0ebd1cdc
|
精简版常用查询
|
2024-09-26 17:00:59 +08:00 |
|
钱涛
|
fed88b5ac5
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-24 19:05:21 +08:00 |
|
钱涛
|
6f10ac4ab2
|
取消非系统人员菜单
|
2024-09-24 19:04:57 +08:00 |
|
钱涛
|
63c6a5af5e
|
业务线配置
|
2024-09-24 19:02:40 +08:00 |
|
钱涛
|
a40814fa0b
|
业务线sql
|
2024-09-24 14:37:46 +08:00 |
|
钱涛
|
ae708a1d3b
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-24 13:19:59 +08:00 |
|
钱涛
|
17ef5a3c2b
|
浮动数据菜单
|
2024-09-24 13:19:20 +08:00 |
|
钱涛
|
7584404bc1
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-20 10:27:42 +08:00 |
|
钱涛
|
ee535fc2bf
|
1、业务线-新建累计专项附加扣除
2、业务线-报表
|
2024-09-19 16:46:36 +08:00 |
|
钱涛
|
db064863b2
|
版本号
|
2024-09-19 14:19:26 +08:00 |
|
钱涛
|
6e7ccb2339
|
浮动薪资档案分权
|
2024-09-18 18:19:58 +08:00 |
|
Harryxzy
|
ab3b3cc3b2
|
领悦-需求调整
|
2024-09-14 14:06:31 +08:00 |
|
钱涛
|
96ced6e934
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-13 17:32:58 +08:00 |
|
钱涛
|
de0728665b
|
导入往期累计
|
2024-09-13 17:32:15 +08:00 |
|
Harryxzy
|
9e5810f173
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-09-13 11:11:24 +08:00 |
|
钱涛
|
e8b2fec1ff
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-12 15:03:19 +08:00 |
|
钱涛
|
8aa34b806c
|
日志权限
|
2024-09-12 14:50:10 +08:00 |
|
钱涛
|
c7659e0717
|
数据采集权限
|
2024-09-11 10:28:20 +08:00 |
|
钱涛
|
a0fb036bce
|
业务线配置
|
2024-09-09 19:10:40 +08:00 |
|
钱涛
|
1dd8f12534
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# resource/wiki/扩展功能/hrmSalaryCustom.properties
|
2024-09-09 14:20:56 +08:00 |
|
Harryxzy
|
822214710f
|
领悦
|
2024-09-06 15:36:20 +08:00 |
|
钱涛
|
17afe87356
|
申报表权限规则
|
2024-09-05 18:14:02 +08:00 |
|
钱涛
|
5ccee97429
|
新建账套携带各扣缴义务人人员范围
|
2024-09-04 13:59:00 +08:00 |
|
钱涛
|
b7f9a1653c
|
线程数量
|
2024-09-02 17:41:07 +08:00 |
|
钱涛
|
ecfa6a4604
|
跨扣缴义务人核算
|
2024-09-02 17:36:41 +08:00 |
|
钱涛
|
13665d8269
|
业务线列表
|
2024-09-02 10:43:28 +08:00 |
|
Harryxzy
|
9c055fe693
|
领悦temp
|
2024-08-30 17:44:26 +08:00 |
|
钱涛
|
3721867723
|
核算和账套的权限
|
2024-08-28 17:55:42 +08:00 |
|
Harryxzy
|
b43b7ad678
|
领悦-报表
|
2024-08-28 17:42:16 +08:00 |
|
钱涛
|
9b96d0cff2
|
限制账套
|
2024-08-28 10:02:39 +08:00 |
|
钱涛
|
36c325c62d
|
sql权限
|
2024-08-23 09:38:54 +08:00 |
|
钱涛
|
a22aa624db
|
权限控制
|
2024-08-22 15:37:50 +08:00 |
|
钱涛
|
25321bb357
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
|
2024-08-21 15:49:12 +08:00 |
|
钱涛
|
ae3d666e7d
|
核算和申报权限
|
2024-08-20 11:40:12 +08:00 |
|
钱涛
|
a796752203
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
|
2024-08-19 10:43:43 +08:00 |
|
钱涛
|
659560550a
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 13:18:08 +08:00 |
|
钱涛
|
5071c08d8c
|
Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
|
2024-08-15 13:41:52 +08:00 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |