Merge branch 'mj' into dev

netflix-dao/src/main/java/com/cyksj/model/entity/MidjourneyUserConversation.java

@@ -87,4 +87,9 @@ public class MidjourneyUserConversation extends BaseEntity implements Serializab
      */
     private String buttons;
 
+    /**
+     * 属性
+     */
+    private String properties;
+
 }