ROLE 类代码冲突合并

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/RoleDO.java

@@ -22,10 +22,6 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
	 * 角色名称
	 */
	private String name;
	/**
	 * 角色代码
     */
	private String code;
	/**
	 * 1.系统管理员，2.saas管理员，3.机构管理员
     */
@@ -39,14 +35,6 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
	 */
	private Boolean system;
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "name", length = 50)
	public String getName() {
		return this.name;