Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-12 6e006cb835fce4720139de0cc2ec3be734295ed9

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java

@@ -106,7 +106,7 @@
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getOperator());
                        log.setDescription(order.getConfirmComment());
                        log.setDescription(order.getInspectConfirmComment());
                        log.setCreateTime(order.getActualEndTime());
                    }
                }
@@ -118,7 +118,7 @@
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getOperator());
                        log.setDescription(order.getLeaderConfirmComment());
                        log.setDescription(order.getProblemDescription());
                        log.setCreateTime(order.getActualEndTime());
                    }
                }