Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-basic/pom.xml

@@ -29,6 +29,8 @@
             <version>${bladex.project.version}</version>
         </dependency>
 
+
+
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
@@ -42,6 +44,12 @@
             <artifactId>blade-core-auto</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-service-api</artifactId>
+            <version>3.1.0.RELEASE</version>
+        </dependency>
     </dependencies>
     <groupId>org.springblade</groupId>
     <artifactId>logpm-basic</artifactId>

doc/dpm/物流租户系统.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.5.1",
   "createdTime": "2023-3-27 13:32:56",
-  "updatedTime": "2023-5-6 17:44:25",
+  "updatedTime": "2023-5-8 17:51:56",
   "dbConns": [],
   "profile": {
     "default": {
@@ -17942,6 +17942,23 @@
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "9A2DE488-B987-42ED-8F37-8341C683839C",
           "uiHint": null
+        },
+        {
+          "defKey": "payer",
+          "defName": "付款人",
+          "comment": "1发货方 2 收货方",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "D9C83E3D-49E7-457F-8691-FB83DB0ECEAF"
         }
       ],
       "correlations": [],

pom.xml

@@ -61,6 +61,14 @@
         </dependency>
     </dependencies>
 
+    <!-- 本地私服仓库地址 -->
+    <distributionManagement>
+        <repository>
+            <!--此名称要和.m2/settings.xml中设置的ID一致 -->
+            <id>logpm</id>
+            <url>http://192.168.2.100:8081/repository/logpm-release/</url>
+        </repository>
+    </distributionManagement>
     <build>
         <finalName>${project.name}</finalName>
         <resources>
@@ -163,6 +171,12 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.7</version>
+            </plugin>
         </plugins>
     </build>
 
@@ -179,6 +193,12 @@
             <name>Release Repository</name>
             <url>http://nexus.bladex.vip/repository/maven-releases/</url>
         </repository>
+        <!-- 本地仓库 -->
+        <repository>
+            <id>logpm-release</id>
+            <name>Release Repository</name>
+            <url>http://192.168.2.100:8081/repository/logpm-release/</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>