Commit Graph

Select branches

Hide Pull Requests

custom/万德隆

custom/上汽时代动力电池系统有限公司

custom/上海大族富创得科技股份有限公司

custom/上海港湾-多语言

custom/中天证券股份有限公司

custom/云南保山恒益实业集团有限公司

custom/五院杭州中心

custom/国能长源汉川发电有限公司

custom/天津港引航中心

custom/宁波百川港通国际物流有限公司

custom/广西瑞迅供应链管理

custom/新美光

custom/昂立

custom/易迪希医药科技（嘉兴）有限公司

custom/杭州钱塘新区建设投资集团有限公司

custom/欧姆龙

custom/汇通建设集团

custom/汇通建设集团_bak_251216

custom/江西麟创餐饮文化有限公司

custom/浙江亨通控股股份有限公司

custom/爱信（中国）投资有限公司

custom/福建罗德数字科技有限公司

custom/网联清算有限公司

custom/联特

custom/西部信托

custom/连云港碱业有限公司

custom/钱智

custom/陕西万众

custom/陕西万众_bak260107

custom/领悦业务线

master

release/2.1.2.2211.01

release/2.19.1.2501.01

release/3.0.1.2503.01

release/3.0.2.2504.01

release/个税&业务线

release/个税版本

zhaopeng

archive

cumtom/嘉华

cumtom/嘉华0524bak

custom/bak/20251021/昂立

custom/bak_昂立_240905

custom/billpayroll

custom/juZhengRunNong

custom/shanshuikonggu

custom/万君筑天科技

custom/万新光学

custom/三亚崖州湾科技城管理局

custom/上扬软件

custom/上汽时代动力电池系统有限公司_241211备份

custom/上海广川科技有限公司

custom/上海数智

custom/上海港湾

custom/上海港湾-多语言-240912

custom/上海电力设计院

custom/上海顺胜船务

custom/东风纳米

custom/中山奥莉维亚

custom/中山奥莉维亚-个税

custom/中山奥莉维亚-老版本优先级

custom/中江国际

custom/中江国际-账套分权

custom/中江国际-账套项目改造

custom/中航富士达

custom/丹尼克尔

custom/久保田

custom/乐舱

custom/云南保山恒益实业集团有限公司_bak251014

custom/京贵投资

custom/伏尔康

custom/会田工程技术有限公司

custom/佛山市交通投资集团有限公司

custom/佳运油气

custom/内蒙古新城宾馆

custom/北京城建

custom/医博

custom/医博肛肠

custom/医博肛肠-0101

custom/华达科捷

custom/华进半导体封装先导技术研发中心有限公司

custom/南京双星塑料模具有限公司

custom/南京汉桑科技

custom/南通海星电子股份有限公司

custom/厦门合嘉源生活服务集团有限责任公司

custom/喜盈门国际商业连锁企业

custom/嘉华_temp

custom/四川紫金湾

custom/复旦大学附属儿科医院

custom/大成

custom/宁夏中房实业

custom/宁夏中房实业-个税版

custom/宁夏金帝置业有限公司

custom/宁波盛威卓越

custom/宁波精华

custom/安徽国元信托有限责任公司

custom/宜通世纪科技

custom/富滇银行股份有限公司

custom/山林枫

custom/常州光阳摩托车有限公司-聚才林

custom/常州扬子餐饮管理有限公司

custom/广州新锐光掩模科技有限公司

custom/广源包装

custom/微至

custom/成都德商达

custom/报表公用方法

custom/新孚美

custom/新弘农业

custom/旭化成

custom/晶优光伏

custom/晶测

custom/格思航天

custom/梦燕

custom/正大清江

custom/比米

custom/洺沣科技

custom/浙江省民营经济发展中心

custom/深圳光达顺

custom/深圳安仕新能源

custom/深圳安仕新能源-new

custom/湖南国科微电子

custom/漳州市华威电源科技有限公司

custom/琏升光伏

custom/甘肃省妇幼保健院

custom/甘肃金控

custom/福州市国投

custom/福建时代星云科技有限公司

custom/科蓝柏

custom/科赛尔

custom/科赛尔-bak241014

custom/精成车业

custom/红日

custom/维日托

custom/美之高

custom/美锦能源

custom/美锦能源_0711bak

custom/艾志工业

custom/艾志工业-0412

custom/艾志工业-个税申报-0308bak

custom/芜湖微显智能科

custom/苏州宇邦新型材料股份有限公司

custom/荆门发电

custom/荻硕贝肯

custom/西安秦华燃气

custom/诺普信光筑

custom/贵阳北控水务有限责任公司

custom/路维光电

custom/速普(二开功能未上线)

custom/重庆南华中天信息技术有限公司

custom/金华交投

custom/银盛科技服务集团有限公司

custom/青岛天能

custom/青海金屋子房地产经纪有限公司

custom/领悦

custom/鲁控数字

custom/鸿仕达

custom/鹰图软件

develop

feature/240301-导出excel单元格格式

feature/240301_同步起始缴纳月、起始发薪日期

feature/240301_阅后即焚

feature/240302-报表明细导出

feature/240302-薪资明细表

feature/240302-薪资核算导出模板

feature/240501-累计专项附加扣除一键累计优化

feature/240502_薪资项目增加默认值设置

feature/240701-社保管理员

feature/240702-编辑核算时人员信息

feature/240801-报表义务人、账套分权

feature/240801-浮动薪资

feature/240801-社保方案上下限调整自动调整基数

feature/240801-考勤引用多个账套

feature/240901-报表增加岗位筛选

feature/241001-社保台账人员信息快照

feature/241101-薪资项目设置核算时是否可编辑

feature/241101_薪资档案增加调薪筛选

feature/250101_编辑个税申报表

feature/250301_社保福利台账增减人员

feature/250601_考勤引用编辑

feature/CBS8对接

feature/salary_i18

feature/sql采用mybatis执行

feature/上月数据变量

feature/个税云6万扣除名单

feature/个税兼容版本

feature/云合升级

feature/人员信息快照

feature/减免附表

feature/双击编辑核算结果

feature/在线算税

feature/实发条件查询

feature/导入工具

feature/工资单审批

feature/年终奖最优方案

feature/归档生成往期累计

feature/快照条件搜索报表

feature/批量操作

feature/数据推送

feature/日期函数精度计算

feature/权限

feature/根据考勤报表应出勤分段计薪

feature/档案显示账套信息

feature/次账号

feature/生成脱敏表

feature/税前工资

feature/组织快照

feature/自定义列全局设置

feature/薪资档案增加离职日期

feature/薪酬数据看板

feature/账套副本

feature/迁出拓扑图

feature/重置排序

feature/重置排序-业务线

feature/锁定人员

fix/240301_薪资核算、社保台账导入提示缺失

fix/240302-其他维度人员

fix/240302-多部门筛选

fix/240302-社保福利编辑保存改造

fix/240302-调薪前端保留位数优化

fix/240401-工资单分部显示的是idbug

fix/240501-优化pdf导出

fix/240501-薪资档案导出过滤私有化不可以见字段

fix/240501_移动端查看工资单

fix/240601-补差导入模板bug

fix/240601_社保福利过滤次账号

fix/240603_薪资明细导出排序

fix/240701_报表分页

fix/240701_返聘action优化

fix/240702-社保福利档案导入下载模板bug

fix/240702-社保福利档案添加补差bug修复

fix/240702_薪资明细报表合计过滤

fix/240801-工资明细导出excel单元格格式

fix/240801-核算导入支持vlookup

fix/240801-福利台账明细导入2100

fix/240802-报表数据透视bug

fix/240901_token加解密

fix/240901_社保福利档案补缴添加bug

fix/241001-社保停缴action最后缴纳月支持分开设置

fix/241101-工资单人员信息值缺失

fix/241101_方案关闭福利项后档案清除对应数据

fix/mySalaryMobile员工信息加密

poc/24052301

release/2.1.3.2211.03

release/2.10.1.2401.01

release/2.11.1.2402.01

release/2.12.1.2403.02

release/2.12.1.2404.01

release/2.13.1.2404.02

release/2.13.1.2404.02_pageUtil重命名

release/2.14.1.2405.01

release/2.14.2.2405.02

release/2.14.3.2406.01

release/2.14.4.2406.02

release/2.14.5.2406.03

release/2.15.1.2407.01

release/2.15.2.2409.01

release/2.16.1.2410.01

release/2.17.1.2411.01

release/2.18.1.2412.01

release/2.18.2.2412.02

release/2.2.2.2211.03

release/2.3.1.2211.04

release/2.3.2.2212.01

release/2.4.1.2212.02

release/2.4.2.2212.03

release/2.5.2.22.12.04

release/2.5.3.2301.01

release/2.6.1.2301.02

release/2.6.2.2302.02

release/2.6.3.2302.01

release/2.6.3.2303.01

release/2.7.1.2303.02

release/2.7.2.2303.03

release/2.7.3.2304.01

release/2.7.4.2304.02

release/2.8.2.2305.02

release/2.8.3.2306.01

release/2.8.4.2306.02

release/2.8.4.2306.02.pg

release/2.9.1.2307.01

release/2.9.10.2312.02

release/2.9.2.2307.02

release/2.9.3.2308.01

release/2.9.4.2308.02

release/2.9.5.2309.01

release/2.9.6.2310.01

release/2.9.8.2311.02

release/2.9.9.2312.01

release/3.0.0.2403.01

release/3.0.0.2502.01

release/个税版本-0306无日志

release/个税版本2.14.3.2406.01

北京城建/master+人员范围导入模板BUG

1.0.0

1.1.5.2207.02

1.3.1.2208.01

1.3.2.2208.02

1.3.4.2208.04

1.4.1.2209.01

2.1.1.2210.01

2.1.2.2211.01

2.10.1.2402.01

2.11.1.2402.01

2.11.2.2403.01

2.14.1.2405.01

2.14.3.2406.01

2.14.4.2406.02

2.15.1.2407.01

2.15.2.2410.01

2.16.1.2410.01

2.17.1.2411.01

2.19.1.2501.01

2.2.10.2312.02

2.2.2.2211.03

2.3.1.2211.04

2.3.2.2212.01

2.4.1.2212.02

2.5.1.2212.03

2.5.3.2301.01

2.6.1.2302.01

2.6.2.2302.02

2.7.1.2303.01

2.7.3.2304.01

2.8.1.2305.01

2.8.2.2305.02

2.8.4.2306.01

2.8.4.2308.02

2.9.6.2310.01

2.9.7.2311.01

2.9.9.2312.01

3.0.0.2502.01

3.0.1.2503.01

Mono Color

• 5c80acfd73 美之高 二开 Harryxzy 2025-07-09 11:40:14 +0800
• e225965e33 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 Harryxzy 2025-07-09 10:09:10 +0800
• fb239f34ed 修复薪资核算筛选为空时导出报错 Harryxzy 2025-07-09 10:08:27 +0800
• e3b7ca6e6b 鲁控数字社保福利方案没保存小数位数 custom/鲁控数字 Harryxzy 2025-07-09 09:40:21 +0800
• c258bbee2a 处理冲突 钱涛 2025-07-08 18:36:48 +0800
• ec2a057a3c 版本 钱涛 2025-07-08 18:31:26 +0800
• dd3fe4c821 Merge branch 'release/个税&业务线' into custom/联特 钱涛 2025-07-08 18:30:11 +0800
• aa5547025f Merge branch 'release/个税版本' into release/个税&业务线 钱涛 2025-07-08 18:28:24 +0800
• b82538fea9 申报免税收入 钱涛 2025-07-08 18:28:00 +0800
• cbdc483c4c 薪酬报表浏览框根据业务线分权 Harryxzy 2025-07-07 14:01:05 +0800
• 01774338b2 美之高 Harryxzy 2025-07-07 11:21:48 +0800
• 1dda34408f Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 钱涛 2025-07-07 10:21:54 +0800
• d3e40d1b9e Merge branch 'release/2.19.1.2501.01' into release/个税版本 钱涛 2025-07-07 10:21:36 +0800
• 9830b156a5 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 钱涛 2025-07-07 10:21:09 +0800
• 8168a42b61 日志 钱涛 2025-07-07 10:20:53 +0800
• b55ea81e4e 日志 钱涛 2025-07-07 10:20:24 +0800
• a7e910a672 联特修复 Harryxzy 2025-07-04 16:47:32 +0800
• 16d50d8c1a Merge branch 'release/个税版本' into custom/联特 Harryxzy 2025-07-04 15:24:11 +0800
• be3b4fc7e1 个税版本 个税申报bug修复 Harryxzy 2025-07-04 15:13:28 +0800
• 35ba4ce6b5 美之高 隐藏编辑按钮 Harryxzy 2025-07-04 13:47:36 +0800
• 240cfb9f75 联特需求新增、调整 Harryxzy 2025-07-04 10:43:58 +0800
• 2765d9be25 Merge remote-tracking branch 'origin/custom/联特' into custom/联特 Harryxzy 2025-07-04 09:30:52 +0800
• 0da17360f9 美之高核算审批流程 Harryxzy 2025-07-03 16:55:19 +0800
• 9c0c6e7f4f 美之高核算审批流程 Harryxzy 2025-07-03 13:57:54 +0800
• 4fd9883858 Merge branch 'release/个税&业务线' into custom/钱智 钱涛 2025-07-03 09:09:35 +0800
• 56e19ea9da Merge branch 'release/个税&业务线' into custom/联特 钱涛 2025-07-02 20:45:41 +0800
• d6061fa059 申报 钱涛 2025-07-02 20:43:53 +0800
• 2a883868ba Merge branch 'release/个税版本' into release/个税&业务线 钱涛 2025-07-02 20:08:08 +0800
• a2303bb450 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 钱涛 2025-07-02 20:06:02 +0800
• fe7481d753 核算精准使用附表 钱涛 2025-07-02 20:02:05 +0800
• b2507306e5 附表导入导出功能 钱涛 2025-07-02 15:46:32 +0800
• cabaed627b 其他附加扣除增加申报类型 钱涛 2025-07-02 13:42:41 +0800
• de713c820d 附表填写 钱涛 2025-07-02 11:37:16 +0800
• db99e8239b 万德隆 动态薪资标准 Harryxzy 2025-07-01 22:02:23 +0800
• cb02136ff6 免税收入 钱涛 2025-07-01 18:37:50 +0800
• f917f268a7 Merge branch 'release/2.19.1.2501.01' into custom/喜盈门国际商业连锁企业 Harryxzy 2025-07-01 10:57:39 +0800
• f72d76540a Merge branch 'release/3.0.2.2504.01' into custom/万德隆 Harryxzy 2025-06-30 14:26:28 +0800
• 3a1417b6a1 万德隆 动态薪资标准 Harryxzy 2025-06-30 14:25:55 +0800
• 8399c61020 万德隆 Harryxzy 2025-06-30 10:21:58 +0800
• 5cc0dda5f6 修复业务线版本个税申报bug Harryxzy 2025-06-27 13:45:57 +0800
• 5e634b1e79 Merge branch 'release/3.0.2.2504.01' into custom/万德隆 Harryxzy 2025-06-25 16:04:28 +0800
• f0f90bce9e Merge branch 'feature/sql采用mybatis执行' into custom/万德隆 Harryxzy 2025-06-25 15:28:17 +0800
• d0fdc7de2f 考勤天数=考勤次数/2 Harryxzy 2025-06-25 15:26:26 +0800
• 53c8909de4 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 钱涛 2025-06-25 14:37:22 +0800
• 3c44a5cce4 Merge branch 'release/2.19.1.2501.01' into feature/重置排序 Harryxzy 2025-06-24 15:28:39 +0800
• 17c6163991 艾志优化 Harryxzy 2025-06-20 14:39:31 +0800
• 66b1659401 修复标记无法保存 custom/安徽国元信托有限责任公司 钱涛 2025-06-20 11:28:45 +0800
• 6fcd532eb1 Merge branch 'release/3.0.2.2504.01' into custom/安徽国元信托有限责任公司 钱涛 2025-06-20 10:37:47 +0800
• d2663fe4ca 汇通批量核算改为同步 Harryxzy 2025-06-20 09:55:30 +0800
• 2cd9484069 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 Harryxzy 2025-06-19 17:28:50 +0800
• bfd953d082 水印单独配置分部不显示 Harryxzy 2025-06-19 17:28:09 +0800
• c7dad616a4 钱智合计 Harryxzy 2025-06-19 15:57:25 +0800
• 45acec8468 上线版本 钱涛 2025-06-19 14:40:09 +0800
• 904c053d2c Merge remote-tracking branch 'origin/release/3.0.2.2504.01' into release/3.0.2.2504.01 Harryxzy 2025-06-19 11:39:42 +0800
• 71a3ba4569 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 Harryxzy 2025-06-19 11:39:25 +0800
• e402029f6c Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 Harryxzy 2025-06-19 11:38:40 +0800
• 63c9558331 修复社保上下限校验 漏掉只开启了公司没开启个人的场景 Harryxzy 2025-06-19 11:38:05 +0800
• 490e6ab0fe Merge branch 'release/个税&业务线' into custom/钱智 钱涛 2025-06-19 11:05:53 +0800
• 0b566561a0 Merge branch 'release/个税版本' into release/个税&业务线 钱涛 2025-06-19 11:05:09 +0800
• f5b1768438 利息股息红利所得sql 钱涛 2025-06-19 10:49:29 +0800
• ef1bfbdc25 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 钱涛 2025-06-18 17:22:14 +0800
• c7e295e1d2 Merge branch 'release/2.19.1.2501.01' into release/个税版本 钱涛 2025-06-18 17:21:51 +0800
• d4e6e111fc Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 钱涛 2025-06-18 17:21:35 +0800
• f7cba636b3 修复默认值保留位数 钱涛 2025-06-18 17:21:22 +0800
• cf3d070892 汇通bug修复 Harryxzy 2025-06-18 16:56:16 +0800
• 5f1b513fa6 二开，初始化标记 钱涛 2025-06-18 16:04:51 +0800
• db2b80cddf 二开，标记数据获取上个月的值 钱涛 2025-06-18 15:42:43 +0800
• 26f1d5b0b3 二开，标记功能 钱涛 2025-06-18 14:54:04 +0800
• 5f3c5f82b8 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 钱涛 2025-06-18 13:33:24 +0800
• c27105aa21 Merge branch 'release/2.19.1.2501.01' into release/个税版本 钱涛 2025-06-18 13:33:02 +0800
• a8c6e8e59e Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 钱涛 2025-06-18 13:32:41 +0800
• 919ade5715 Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 钱涛 2025-06-18 13:32:17 +0800
• de5caded9e 修复工资单性别问题 钱涛 2025-06-18 13:32:12 +0800
• c3d6ac8b66 分类所得-上市公司股息红利所得(沪市、深市、创业板) 分类所得-其他利息股息红利所得 钱涛 2025-06-17 17:25:27 +0800
• 3400cff4d0 Merge branch 'release/2.19.1.2501.01' into custom/常州光阳摩托车有限公司-聚才林 Harryxzy 2025-06-17 14:53:35 +0800
• 4c7da1a503 Merge branch 'feature/sql采用mybatis执行' into custom/常州光阳摩托车有限公司-聚才林 Harryxzy 2025-06-17 14:53:22 +0800
• 19b7587d2e 薪酬报表导出合计行修复 Harryxzy 2025-06-17 14:31:20 +0800
• 206837eb6a 薪酬报表导出合计行修复 Harryxzy 2025-06-17 14:09:22 +0800
• 30c6caf0d3 Merge branch 'release/个税版本' into custom/艾志工业 Harryxzy 2025-06-17 14:07:57 +0800
• d4ff9af8b7 分类所得-上市公司股息红利所得(沪市、深市、创业板) 分类所得-其他利息股息红利所得 钱涛 2025-06-17 11:23:30 +0800
• 5e0b9d2732 万德隆调薪流程支持停薪列表 Harryxzy 2025-06-17 11:09:03 +0800
• 1263514a81 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 Harryxzy 2025-06-16 18:06:40 +0800
• c4fdf0f34e Merge branch 'release/2.19.1.2501.01' into custom/汇通建设集团 Harryxzy 2025-06-16 16:42:46 +0800
• c2f2390013 修复薪资明细导出，合计行统计文本字段 Harryxzy 2025-06-16 16:41:38 +0800
• a2f3d57ee5 二开版本 钱涛 2025-06-16 09:57:49 +0800
• ed88d3c531 联特调整 Harryxzy 2025-06-13 14:47:27 +0800
• ea516aca99 Merge branch 'release/个税版本' into custom/艾志工业 Harryxzy 2025-06-13 09:32:46 +0800
• 447d682b4e Merge branch 'release/2.19.1.2501.01' into release/个税版本 Harryxzy 2025-06-13 09:32:11 +0800
• 588884150b 需求变更：改成制造 根据图纸编号；包装 根据料编号 Harryxzy 2025-06-13 09:26:37 +0800
• 0c4c57e53a 需求变更：改成制造 根据图纸编号；包装 根据料编号 Harryxzy 2025-06-12 17:52:01 +0800
• d8cbd1d525 考勤引用日志 Harryxzy 2025-06-12 17:15:53 +0800
• 4f7b7a6cb6 Merge branch 'feature/250101_编辑个税申报表' into custom/西部信托 Harryxzy 2025-06-12 16:46:27 +0800
• cc8ea5946c Merge branch 'feature/250601_考勤引用编辑' into custom/西部信托 Harryxzy 2025-06-12 16:45:31 +0800
• 9daf89f81c 考勤引用日志 feature/250601_考勤引用编辑 Harryxzy 2025-06-12 16:42:45 +0800
• aae8208283 个税申报表编辑操作日志 feature/250101_编辑个税申报表 Harryxzy 2025-06-12 14:25:10 +0800
• 4cbf022a34 解决冲突 Harryxzy 2025-06-12 13:32:53 +0800
• 4b9e75e306 Merge branch 'feature/250601_考勤引用编辑' into custom/西部信托 Harryxzy 2025-06-12 13:28:44 +0800
• 2135989cdb Merge branch 'feature/250101_编辑个税申报表' into custom/西部信托 Harryxzy 2025-06-12 13:27:06 +0800
• 3dc9f327df Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 钱涛 2025-06-12 11:04:58 +0800
• 9d55bc8a0f toMap空指针bug release/2.10.1.2401.01 Harryxzy 2025-06-12 10:43:06 +0800