钱涛 e6c6b8eb57 Merge branch 'auth-fl' into release ... # Conflicts: # resource/sql/分权.sql # src/com/engine/salary/biz/SIAccountBiz.java # src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml # src/com/engine/salary/service/impl/SIAccountServiceImpl.java # src/com/engine/salary/service/impl/SIExportServiceImpl.java		2022-06-10 16:58:45 +08:00
..
oracle	oracle脚本调整位置	2022-05-30 17:34:53 +08:00
mysql.sql	暂存	2022-05-31 19:29:45 +08:00
sqlserver.sql	账套项目删除bug	2022-05-18 14:34:06 +08:00
公式配置修改.sql	暂存	2022-05-31 19:29:45 +08:00
分权.sql	社保福利分权2.0	2022-06-06 19:08:39 +08:00
分权sql server.sql	默认关闭	2022-06-07 19:16:13 +08:00
初始化系统薪资项目及对应的公式.sql	账套项目删除bug	2022-05-18 14:34:06 +08:00
清理账套异常薪资项目.sql	fix	2022-06-01 15:59:56 +08:00
申报表.sql	人员范围保存校验	2022-06-10 14:21:21 +08:00
缺少字段.sql	累计扣除字段	2022-05-20 14:41:42 +08:00
薪资还原脚本.sql	申报和往期异常	2022-06-08 16:36:50 +08:00