Merge remote-tracking branch 'origin/main'

luoo_music/src/main/java/com/luoo/music/dao/JournalDao.java

@@ -25,7 +25,7 @@ public interface JournalDao extends JpaRepository<Journal,String>,JpaSpecificati
 
     @Modifying
     @Transactional
-    @Query("UPDATE Journal j SET j.state = '1', j.pubTime = :pubTime WHERE j.id = :id")
+    @Query("UPDATE Journal j SET j.isPublish = '1', j.pubTime = :pubTime WHERE j.id = :id")
     int updatePubById(@Param("id") String id,
                       @Param("pubTime") LocalDateTime pubTime);