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

jinpengyong

2021-06-24 06b00a178d194d33370e44410c4f04a4164f86c7

 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;

    /**