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
package com.moral.entity.layout;
 
import lombok.Data;
 
@Data
public class RtdLayoutUpload {
    RealTimeDeviceLayout realTimeDeviceLayout;
    Integer organizationId;
    Integer version;
}