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

lizijie

2021-05-28 43e5052b91f0568ccbcf3fd6df70cf8209db184a

 screen-manage/src/main/java/com/moral/api/entity/ManageRole.java

@@ -22,8 +22,11 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class ManageRole extends Model<ManageRole> {



    private static final long serialVersionUID = 1L;

    /**