• hongguangwu's avatar
    Merge remote-tracking branch 'origin/develop' into develop · c9a7f6e2
    hongguangwu authored
    # Conflicts:
    #	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
    #	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardService.java
    #	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
    #	yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
    c9a7f6e2
Name
Last commit
Last update
..
MSalaryEstimateMapper.xml Loading commit data...
MSalaryPaymentResMapper.xml Loading commit data...
MTitleConfigMapper.xml Loading commit data...
SysMessageSalaryMapper.xml Loading commit data...
SysMessageSalaryTempMapper.xml Loading commit data...
TApprovalRecordMapper.xml Loading commit data...
TConfigSalaryMapper.xml Loading commit data...
TDeptSeeMapper.xml Loading commit data...
THaveSalaryNosocialMapper.xml Loading commit data...
TMinSalaryMapper.xml Loading commit data...
TOwnDeptMapper.xml Loading commit data...
TPauseSalaryMapper.xml Loading commit data...
TSalaryAccount2022Mapper.xml Loading commit data...
TSalaryAccountItemMapper.xml Loading commit data...
TSalaryAccountMapper.xml Loading commit data...
TSalaryAttaMapper.xml Loading commit data...
TSalaryConfigStandardMapper.xml Loading commit data...
TSalaryEmployeeMapper.xml Loading commit data...
TSalaryExcelCheckMapper.xml Loading commit data...
TSalaryLockMapper.xml Loading commit data...
TSalaryStandardMapper.xml Loading commit data...
TSalaryStandardSetDetailMapper.xml Loading commit data...
TSalaryStandardSetMapper.xml Loading commit data...
TSalaryTaxConfigMapper.xml Loading commit data...
TSpecialDeducationSumMapper.xml Loading commit data...
TStatisticsBonusMapper.xml Loading commit data...
TStatisticsCurrentReportMapper.xml Loading commit data...
TStatisticsCurrentReportMarketMapper.xml Loading commit data...
TStatisticsDeclarerMapper.xml Loading commit data...
TStatisticsLaborMapper.xml Loading commit data...
TStatisticsRemunerationMapper.xml Loading commit data...
TStatisticsTaxSalaryMapper.xml Loading commit data...
TStatisticsTaxSalaryRuleMapper.xml Loading commit data...