1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -106,6 +106,14 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 合营加价
      */
     private Double jointVentureMarkup;
+    /**
+     * 合营方
+     */
+    private String jointVentureParties;
+    /**
+     * 合营方电话
+     */
+    private String jointPhone;
     /**
      * 买方
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -109,6 +109,14 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
      * 其他负责人电话
      */
     private String otherPersonPhone;
+    /**
+     * 合营方
+     */
+    private String jointVentureParties;
+    /**
+     * 合营方电话
+     */
+    private String jointPhone;
     /**
      * 仓库所在地省
      */

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -128,7 +128,7 @@
         <if test="appFlag == null">
         group BY w.base_id,DATE_FORMAT(w.issuing_time,"%Y%m%d")
         </if>
-        ORDER BY w.update_date DESC
+        ORDER BY w.create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>
@@ -210,7 +210,7 @@
         <if test="appFlag == null">
             group BY w.base_id,DATE_FORMAT(w.issuing_time,"%Y%m%d")
         </if>
-        ORDER BY w.update_date DESC
+        ORDER BY w.create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>