aokunsang před 2 měsíci
rodič
revize
4467dd2dc7

+ 15 - 15
platomix-gmetry-system-api/pom.xml

@@ -10,7 +10,7 @@
     <!--    日期和版本号需要同时升级-->
     <!--    4.2.64-2024.07.22->4.2.65-2024.07.22->4.2.66-2024.07.23-->
     <artifactId>platomix-gmetry-system-api</artifactId>
-    <version>4.1.15-20241113</version>
+    <version>4.1.17-20241114</version>
     <dependencies>
         <dependency>
             <groupId>com.platomix</groupId>
@@ -72,20 +72,20 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-<!--			<plugin>-->
-<!--	             <groupId>io.fabric8</groupId>-->
-<!--	             <artifactId>docker-maven-plugin</artifactId>-->
-<!--	             <executions>-->
-<!--	                 <execution>-->
-<!--	                     <id>build-push</id>-->
-<!--	                     <phase>package</phase>-->
-<!--	                     <goals>-->
-<!--	                         <goal>build</goal>-->
-<!--	                         <goal>push</goal>-->
-<!--	                     </goals>-->
-<!--	                 </execution>-->
-<!--	             </executions>-->
-<!--	         </plugin>-->
+			<plugin>
+	             <groupId>io.fabric8</groupId>
+	             <artifactId>docker-maven-plugin</artifactId>
+	             <executions>
+	                 <execution>
+	                     <id>build-push</id>
+	                     <phase>package</phase>
+	                     <goals>
+	                         <goal>build</goal>
+	                         <goal>push</goal>
+	                     </goals>
+	                 </execution>
+	             </executions>
+	         </plugin>
         </plugins>
     </build>
 

+ 2 - 1
platomix-gmetry-system-api/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml

@@ -249,7 +249,8 @@
                 path,
                 source,
                 action,
-                sort
+                sort,
+                tenant_id
             FROM
                 blade_menu
             WHERE