admin/src/main/java/com/flyer/foster/dto/GardenAddDTO.java

@@ -21,7 +21,6 @@ public class GardenAddDTO {
     @NotBlank(message = "果园名称不能为空")
     private String name;
 
-    @NotBlank(message = "果园图标不能为空")
     private String icon;
 
     /**

admin/src/main/java/com/flyer/foster/service/impl/TreePosterContentServiceImpl.java

@@ -62,7 +62,6 @@ public class TreePosterContentServiceImpl extends ServiceImpl<ITreePosterContent
                     .eq(TreePosterContent::getPosterLibId, posterLib.getId())
                     .eq(TreePosterContent::getAppUserId, addDTO.getAppUserId())
                     .eq(TreePosterContent::getTreeId, addDTO.getTreeId())
-                    .eq(TreePosterContent::getStatus, 1)
                     .one();
             if (treePosterContent == null) {
                 // 2.获取悄悄话，取最新一条记录
@@ -134,7 +133,6 @@ public class TreePosterContentServiceImpl extends ServiceImpl<ITreePosterContent
 
         List<TreePosterContent> treePosterContentList = this.lambdaQuery()
                 .eq(TreePosterContent::getTreeId, queryDTO.getTreeId())
-                .eq(TreePosterContent::getStatus, 1)
                 .between(TreePosterContent::getCreatedTime, min, max)
                 .orderByDesc(TreePosterContent::getCreatedTime)
                 .list();

admin/src/main/resources/mapper/GardenMapper.xml

@@ -23,7 +23,7 @@
                    when 1 then '启用'
                    end        as statusName,
                a.created_time as createdTime,
-               b.updated_time as updatedTime
+               a.updated_time as updatedTime
         from tb_garden a
                  left join tb_user b on a.user_id = b.id
                  left join tb_world_map c on a.world_map_id = c.id