Merge remote-tracking branch 'origin/master'

lyh

2 天以前 bc8cd378fd72f43e66120c540f57f630580aa093

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml

@@ -6,6 +6,9 @@
        SELECT
            t1.id,
            t1.equipment_id equipmentId,
            t1.usage_quantity usageQuantity,
            t1.addition_site additionSite,
            t1.oil_time oilTime,
            t1.fluid_id fluidId,
            t2.fluid_code fluidCode,
            t2.fluid_name fluidName