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

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description : 待发布订单列表输出模型
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-02 13:13
+ * @Modify:
+ **/
+@Data
+public class SwebPOForPubListResultModelV2 extends BaseBean {
+
+    @ApiParam(value = "拆分请求时间数量列表", example = "1")
+    private List<String> reqTimeList = Collections.EMPTY_LIST;
+
+    @ApiParam(value = "列表", example = "1")
+    private List<SwebPOForPubListResultItemModel> list = Collections.EMPTY_LIST;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -121,7 +121,6 @@ public class SwebHqlPack {
 
     public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);