Merge remote-tracking branch 'origin/driver' into driver

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java

@@ -824,7 +824,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
                 if (ObjectUtil.isEmpty(item.getItemDiscount())) {
                     itemDiscount = new BigDecimal("1.00");
                 }
-                project.put("repDiscount", itemDiscount.equals(new BigDecimal("1.00")) ? "1" : item.getItemDiscount());
+                project.put("repDiscount", itemDiscount.equals(new BigDecimal("1.00")) ? "1.00" : item.getItemDiscount());
                 // 工时费 项目打折后的费用
                 // 取不到先给0
                 project.put("labourAmount", item.getItemMoney());

dl-module-repair/src/main/resources/templates/modified_ticketTemplate.docx

@@ -27,7 +27,7 @@
 {{insuranceName}}
 旧件处理：
 {{oldhandle}}
-维修内容
+                                 维修项目
                               {{projects}}序号
                                  维修项目
                                     单价