Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

1
2
3
4
5
6
7
8
9
10
11
12
package com.moral.entity;
 
import lombok.Data;
 
import java.util.Date;
 
@Data
public class AlarmModel {
      private  String mac;
      private  Integer state;
      private Date time;
}