Merge branch 'test' into dev

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -112,6 +112,11 @@ public class ContractVo extends Contract {
     private String customerName;
 
     /**
+     * 金额CNY
+     */
+    private BigDecimal amountCNY;
+
+    /**
      * 新到款状态
      */
     private String refundStatusNew;

hx-sale/src/main/java/com/fjhx/sale/entity/pack/vo/PackDetailVo.java

@@ -23,4 +23,9 @@ public class PackDetailVo extends PackDetail {
      * 装箱明细数据JSON
      */
     private String dataJsonList;
+
+    /**
+     * 装箱明细IDS
+     */
+    private String ids;
 }

hx-sale/src/main/resources/mapper/pack/PackDetailMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.fjhx.sale.mapper.pack.PackDetailMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.pack.vo.PackDetailVo">
         select *
-        from (SELECT t1.id,
+        from (SELECT
+                     GROUP_CONCAT( t1.id ) AS ids,
+                     t1.id,
                      t1.pack_id,
                      t1.waybill_code,
                      t1.express_id,