Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
This commit is contained in:
commit
5435a5a736
|
|
@ -641,7 +641,7 @@ public class SalaryBillBO {
|
||||||
emailContent.append("</th>");
|
emailContent.append("</th>");
|
||||||
|
|
||||||
emailContent.append("<td style=\"padding: 16px 24px;display: table-cell;flex: 1;color: #000000d9;font-size: 12px;line-height: 1.5715;word-break: break-word;overflow-wrap: break-word;border-collapse: collapse;border: 1px solid rgba(0,0,0,.06);\">");
|
emailContent.append("<td style=\"padding: 16px 24px;display: table-cell;flex: 1;color: #000000d9;font-size: 12px;line-height: 1.5715;word-break: break-word;overflow-wrap: break-word;border-collapse: collapse;border: 1px solid rgba(0,0,0,.06);\">");
|
||||||
emailContent.append(e.get(keyName.toString()));
|
emailContent.append(e.getOrDefault(keyName.toString(), StringUtils.EMPTY));
|
||||||
emailContent.append("</td>");
|
emailContent.append("</td>");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -721,7 +721,7 @@ public class SalaryBillBO {
|
||||||
emailContent.append("</th>");
|
emailContent.append("</th>");
|
||||||
|
|
||||||
emailContent.append("<td style=\"padding: 16px 24px;display: table-cell;flex: 1;color: #000000d9;font-size: 12px;line-height: 1.5715;word-break: break-word;overflow-wrap: break-word;border-collapse: collapse;border: 1px solid rgba(0,0,0,.06);\">");
|
emailContent.append("<td style=\"padding: 16px 24px;display: table-cell;flex: 1;color: #000000d9;font-size: 12px;line-height: 1.5715;word-break: break-word;overflow-wrap: break-word;border-collapse: collapse;border: 1px solid rgba(0,0,0,.06);\">");
|
||||||
emailContent.append(e.get(keyName.toString()));
|
emailContent.append(e.getOrDefault(keyName.toString(), StringUtils.EMPTY));
|
||||||
emailContent.append("</td>");
|
emailContent.append("</td>");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue