Merge remote-tracking branch 'origin/master'

Lius

2023-10-30 ff9dc3f8220dfeb9acddd2f86c28718001e70314

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

@@ -30,7 +30,11 @@
                                            @Param("equipmentNum") String equipmentNum,
                                            @Param("equipmentName")  String equipmentName,
                                            @Param("status")  String status,
                                            @Param("repairOrderType") Integer repairOrderType
                                            @Param("repairOrderType") Integer repairOrderType,
                                         @Param("equipmentCategoryId")   String equipmentCategoryId,
                                         @Param("factoryModelId")    String  factoryModelId,
                                         @Param("specificEquipment")     String     specificEquipment,
                                         @Param("teamId")   String teamId
    );

    IPage<Map<String, Object>> getUserTeam(IPage<Map> pageData, @Param("realname") String realname);