Commit 1bf1ef46 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6

parents fbfbdd3c f6b008e8
......@@ -70,10 +70,10 @@ public class ArchiveTask {
}
public void everyDayCreateComlpeteMonitor() {
log.info("-------------每刷新档案完整监控数据------------");
log.info("-------------每刷新档案完整监控数据------------");
HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(), daprArchivesProperties.getAppId(),
"/tcompletemonitor/inner/createComlpeteMonitor", "", Object.class,
SecurityConstants.FROM_IN);
log.info("-------------每刷新档案完整监控数据-定时任务开始------------");
log.info("-------------每刷新档案完整监控数据-定时任务开始------------");
}
}
\ No newline at end of file
......@@ -414,7 +414,7 @@ public class TSalaryAccount extends BaseEntity {
*/
@ExcelAttribute(name = "实发(个人实收)")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("实发(个人实收)")
@ExcelProperty("个人实发合计")
private BigDecimal actualSalary;
/**
* 个税金额(个人承担)
......
......@@ -73,7 +73,7 @@ public class TSalaryAccountExportVo {
private String empIdcard;
@ExcelProperty("工资应发")
private BigDecimal relaySalary;
@ExcelProperty("实发工资合计")
@ExcelProperty("个人实发合计")
private BigDecimal actualSalary;
@ExcelProperty("年终奖")
private BigDecimal annualBonus;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment