Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocAreaMapper.java

@@ -31,14 +31,14 @@ public interface AllocAreaMapper extends BaseMapper<AllocArea> {
 
    @Select({"SELECT MAX(area_num) FROM alloc_area WHERE if_del = 2 AND super_id = #{superId}"})
    String getLatestAreaNum(Long superId);
-//
+
    @Select({"SELECT area_id, area_name FROM alloc_area WHERE if_del = 2 AND area_name = #{areaName}"})
    AllocArea getAreaIdByName(String areaName);
-//
+
-//   @LeNiuDataPermission(
+   @LeNiuDataPermission(
-//      alias = "t1",
+      alias = "t1",
-//      permissionType = DataPermissionTypeEnum.PERMISSION_AREA
+      permissionType = DataPermissionTypeEnum.PERMISSION_AREA
-//   )
+   )
    List<AllocAreaTreeVO> listAllTreeArea();
 
    List<AllocAreaTreeVO> listSystemArea(Long tenantId);