Merge branch 'lal' into develop

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -2075,7 +2075,7 @@ public class SalaryManagementController {
 						System.out.println("个税计算错误");
 					}
 					double result = personal_income_tax < 0 ? 0.0 : personal_income_tax;
-					XcglAssoXzb.builder().xzxjg(result).build().update(new QueryWrapper<XcglAssoXzb>().lambda().eq(XcglAssoXzb::getXzxid, xzx.getId()).eq(XcglAssoXzb::getUserid, pag.getUserid()));
+					XcglAssoXzb.builder().xzxjg(SalaryTool.formatDouble_(result)).build().update(new QueryWrapper<XcglAssoXzb>().lambda().eq(XcglAssoXzb::getXzxid, xzx.getId()).eq(XcglAssoXzb::getUserid, pag.getUserid()));
 				}