Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -126,6 +126,7 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
             TaRole taRole = new TaRole();
             taRole.setRoleName(name);
             taRole.setOrgId(orgId);
+            taRole.setStatus(1);
             taRole.setCreateDate(LocalDateTime.now());
             taRoleMapper.insert(taRole);
 

src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java

@@ -49,7 +49,7 @@ public class SysButtonInMenu implements Serializable {
     private String code;
     
     private String remark;
-    
+
     @TableField(exist = false)
     private List<Integer> roles;
 }