Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

 src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java

@@ -34,7 +34,7 @@
 */
public interface EquipmentMapper extends BaseMapper<Equipment> {

   List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
   List<Equipment> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);

   void s(Equipment equipment);
   void updateOne(Equipment equipment);