Merge remote-tracking branch 'origin/0803-add_column' into 0803-add_column

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java

@@ -380,8 +380,8 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus()));
                 vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus()));
                 vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus()));
-                vo.setImageId(vo.getImageId());
+                vo.setImageNumber(vo.getImageNumber());
-                log.info("vo.getImageId() = {}",vo.getImageId());
+                log.info("vo.getImageId() = {}",vo.getImageNumber());
 
                 if ("1".equals(vo.getInAccountStatus())){
                     vo.setInAccountStatus("已入账");

dxhy-core/src/main/resources/mapper/QstjbMapper.xml

@@ -22,7 +22,7 @@
         <result column="deptName" property="businessName"/>
         <result column="inaccount_status" property="inAccountStatus"/>
         <result column="sn_voucher_number" property="snVoucherNumber"/>
-        <result column="posting_time" property="postingTime"/>
+        <result column="postingTime" property="postingTime"/>
         <result column="image_id" property="imageNumber"/>
         <result column="account_period" property="accountPeriod"/>
         <result column="bzdh" property="bzdh"/>

dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml

@@ -366,7 +366,7 @@
         p.cxrz_status as cxrzStatus,
         p.sn_voucher_number as snVoucherNumber,
         p.posting_time as postingTime,
-        p.image_id as imageId,
+        p.image_id as imageNumber,
         p.account_period as account_period,
         p.bzdh,
         p.bzr,