Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2023-12-13 5677ab158fb78d1267c16bbbf29eb690e0b4039f

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java

@@ -116,6 +116,8 @@
                equipment.getWarrantyStart(),
                equipment.getWarrantyEnd(),
                equipment.getLineId(),
                equipment.getIsLineEquip(),
                equipment.getIsLine(),
                sql
        ));
    }