Merge remote-tracking branch 'origin/master'

zhangherong

8 天以前 6722e123b7a54dcc6c6937bc4324c67293f233db

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java

@@ -37,6 +37,13 @@
    List<EamEquipmentTree> loadTreeListByProductionIds(String ids);

    /**
     * 获取EAM中心下的设备信息
     * @param ids EAM中心ids
     * @return
     */
    List<EamEquipmentTree> loadTreeListByEamCenterIds(String ids);

    /**
     * 设备台账分页查询
     * @param page
     * @param eamEquipment