Merge branch 'gyj' into test

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPermissionDto.java

@@ -25,4 +25,11 @@ public class TbShopPermissionDto {
     private Integer hasPermission;
 
     private List<TbShopPermissionDto> children;
+
+    public Integer getHasPermission() {
+        if (hasPermission == null) {
+            return 0;
+        }
+        return hasPermission;
+    }
 }