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

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": [],