Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuAddDTO.java

@@ -44,6 +44,10 @@ public class MenuAddDTO {
      * 组件
      */
     private String component;
+    /**
+     * 组件名称
+     */
+    private String name;
     /**
      * 菜单排序
      */

cash-common/cash-common-service/src/main/java/com/czg/account/dto/menu/MenuEditDTO.java

@@ -38,6 +38,10 @@ public class MenuEditDTO {
      * 组件
      */
     private String component;
+    /**
+     * 组件名称
+     */
+    private String name;
     /**
      * 菜单排序
      */

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserAddDTO.java

@@ -39,12 +39,6 @@ public class ShopUserAddDTO {
      */
     private Integer sex;
 
-    /**
-     * 用户Id
-     */
-    @NotNull(message = "用户id不为空")
-    private Long userId;
-
     /**
      * 账户积分
      */

cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java

@@ -24,4 +24,6 @@ public interface SysRoleService extends IService<SysRole> {
     Boolean add(RoleAddDTO roleAddDTO);
 
     Boolean edit(RoleEditDTO roleEditDTO);
+
+    List<Long> getRoleMenu(long loginIdAsLong, Integer id);
 }