Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

yaowanxin

昨天 ca788dcbd73c5c8665b45da7ff4a0b1d92196b2c

 main-business/src/main/java/com/ruoyi/business/dto/EquipmentManagementDto.java

@@ -5,4 +5,8 @@

@Data
public class EquipmentManagementDto extends EquipmentManagement {

    private String searchAll;//搜索

    private Integer usedNo;//已使用数量
}