Merge remote-tracking branch 'origin/master'

xuhy

6 天以前 3e5134249dc75acdabfc467d8c03f321992cdf07

 ruoyi-system/src/main/java/com/ruoyi/system/dto/EquipmentDto.java

@@ -7,5 +7,7 @@
public class EquipmentDto {
    private String id;

    private String name;

    private Integer count;
}