Merge remote-tracking branch 'origin/feature/dify' into feature/dify

src/main/java/com/zsc/edu/dify/DifyBackendApplication.java

@@ -7,7 +7,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
 @SpringBootApplication
 @EnableAspectJAutoProxy
-@EnableCaching
+//@EnableCaching
 public class DifyBackendApplication {
 
 	public static void main(String[] args) {

src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ChatController.java

@@ -130,7 +130,7 @@ public class V1ChatController {
      */
     @DeleteMapping("/conversation")
     @PreAuthorize("hasAuthority('dify:chat:delete')")
-    @OperationLogAnnotation(content = "'dify对话", operationType = "删除")
+    @OperationLogAnnotation(content = "'dify对话'", operationType = "删除")
     public void deleteConversation(@RequestParam String conversationId, @RequestParam String appId) {
         String apiKey = appEntityService.getApikey(appId);
         String userId = SecurityUtil.getUserInfo().id.toString();