Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun

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

@@ -57,6 +57,7 @@
         m.buyer,
         m.deposit,
         m.remarks,
+        m.remark,
         m.deposit_url as depositUrl,
         m.seller,
         p.imperfect_grain as imperfectGrain,

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

@@ -32,6 +32,7 @@
         q.customer_name as customerName,
         q.quality_inspector as qualityInspector,
         q.car_number as carNumber,
+        q.management_type as managementType,
         q.goods_name as goodsName,
         q.grade,
         q.imperfect_grain as imperfectGrain,