Merge branch 'dev' of https://github.com/babyfish-ct/jimmer into dev

babyfish-ct · Nov 2, 2024 · 655fcb1 · 655fcb1
2 parents b66c6e0 + 4162b1a
commit 655fcb1
Show file tree

Hide file tree

Showing 6 changed files with 1,139 additions and 1,106 deletions.
diff --git a/project/jimmer-client/src/test/java/org/babyfish/jimmer/client/java/model/BookStore.java b/project/jimmer-client/src/test/java/org/babyfish/jimmer/client/java/model/BookStore.java
@@ -7,6 +7,7 @@
 import org.babyfish.jimmer.sql.Id;
 import org.babyfish.jimmer.sql.OneToMany;
 
+import java.time.LocalTime;
 import java.util.List;
 
 /**
@@ -26,6 +27,10 @@ public interface BookStore {
     @OneToMany(mappedBy = "store")
     List<Book> books();
 
+    LocalTime openTime();
+
+    LocalTime closeTime();
+
     enum Level {
         LOW,
         MIDDLE,

diff --git a/...er-client/src/test/java/org/babyfish/jimmer/client/java/openapi/OpenApiGeneratorTest.java b/...er-client/src/test/java/org/babyfish/jimmer/client/java/openapi/OpenApiGeneratorTest.java
@@ -836,6 +836,10 @@ public void testBookService() {
                         "          type: array\n" +
                         "          items:\n" +
                         "            $ref: '#/components/schemas/Dynamic_Book'\n" +
+                        "        openTime:\n" +
+                        "          type: string\n" +
+                        "        closeTime:\n" +
+                        "          type: string\n" +
                         "    Dynamic_Author:\n" +
                         "      type: object\n" +
                         "      properties:\n" +

diff --git a/project/jimmer-client/src/test/kotlin/org/babyfish/jimmer/client/kotlin/model/KBookStore.kt b/project/jimmer-client/src/test/kotlin/org/babyfish/jimmer/client/kotlin/model/KBookStore.kt
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue
 import org.babyfish.jimmer.sql.Entity
 import org.babyfish.jimmer.sql.Id
 import org.babyfish.jimmer.sql.OneToMany
+import java.time.LocalTime
 
 @Entity
 interface KBookStore {
@@ -22,6 +23,10 @@ interface KBookStore {
      */
     @OneToMany(mappedBy = "store")
     val books: List<KBook>
+
+    val openTime: LocalTime
+
+    val closeTime: LocalTime
 }
 
 enum class KLevel {