Merge branch 'dev' into test

src/pages/logistics/addLogistics/index.tsx

@@ -393,21 +393,21 @@ const AddLogistics: React.FC<{}> = () => {
             })
             break;
           case 4:
-            PublicApi.getAsReplaceGoodsPageReturnCommodityByLogistics({ ...params, dataId: query.shipmentOrderId ? query.shipmentOrderId : query.relevanceOrderId }).then(res => {
+            PublicApi.getAsReplaceGoodsPageReturnCommodityByLogistics({ ...params, dataId: query.relevanceOrderId ? query.relevanceOrderId : query.shipmentOrderId }).then(res => {
               if (res.code === 1000) {
                 resolve(res.data)
               }
             })
             break;
           case 5:
-            PublicApi.getAsReplaceGoodsPageReplaceCommodityByLogistics({ ...params, dataId: query.shipmentOrderId ? query.shipmentOrderId : query.relevanceOrderId }).then(res => {
+            PublicApi.getAsReplaceGoodsPageReplaceCommodityByLogistics({ ...params, dataId: query.relevanceOrderId ? query.relevanceOrderId : query.shipmentOrderId }).then(res => {
               if (res.code === 1000) {
                 resolve(res.data)
               }
             })
             break;
           case 6:
-            PublicApi.getAsReturnGoodsPageCommodityByLogistics({ ...params, dataId: query.shipmentOrderId ? query.shipmentOrderId : query.relevanceOrderId }).then(res => {
+            PublicApi.getAsReturnGoodsPageCommodityByLogistics({ ...params, dataId: query.relevanceOrderId ? query.relevanceOrderId : query.shipmentOrderId }).then(res => {
               if (res.code === 1000) {
                 resolve(res.data)
               }

src/pages/logistics/list/components/templateForm.tsx

@@ -342,7 +342,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
                     <Col span={24}>
                       <Field
                         name="designateList"
-                        maxItems={3}
+                        minItems={1}
                         type="array"
                         x-component="ArrayTable"
                         x-component-props={{