优化

platform-dao/src/main/java/com/platform/dao/dto/merge/LongYanPurchaseOrderMergeDTO.java

@@ -37,7 +37,6 @@ public class LongYanPurchaseOrderMergeDTO extends BaseDTO implements Serializabl
           /**
      *
      */
-          private String purchaseOrderId;
           /**
      *
      */

platform-dao/src/main/java/com/platform/dao/entity/merge/LongYanPurchaseOrderMerge.java

@@ -41,7 +41,6 @@ public class LongYanPurchaseOrderMerge implements Serializable{
     /**
      *
      */
-    private String purchaseOrderId;
     /**
      *
      */

platform-dao/src/main/java/com/platform/dao/vo/query/merge/LongYanPurchaseOrderMergeVO.java

@@ -37,7 +37,6 @@ public class LongYanPurchaseOrderMergeVO extends BaseVO implements Serializable{
         /**
      *
      */
-        private String purchaseOrderId;
         /**
      *
      */

platform-dao/src/main/resources/mapper/merge/LongYanPurchaseOrderMergeMapper.xml

@@ -15,9 +15,6 @@
     <sql id="List_Condition">
                                     <if test="id != null and id != ''">
                     and menu.id = #{id}
-                </if>
-                                                <if test="purchaseOrderId != null and purchaseOrderId != ''">
-                    and menu.purchase_order_id = #{purchaseOrderId}
                 </if>
                                                 <if test="createdTimeStart != null">
                     and menu.created_time <![CDATA[>=]]>; #{createdTimeStart}

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -189,7 +189,7 @@ public class YongyouController {
     }
 
     @SysLog("向用友推送合并的采购单")
-    @GetMapping("/push/purchaseOrder/{mergeId}")
+    @GetMapping("/push/merge/purchaseOrder/{mergeId}")
     public R pushMergePurchaseOrder(@PathVariable String mergeId) {
         return new R(yongyouService.pushMergePurchaseOrder(mergeId));
     }