委托备注

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/FundHandleExportVo.java

@@ -157,7 +157,7 @@ public class FundHandleExportVo implements Serializable {
 	private String providentHouseholdName;
     /**
      *
-     *委托备注
+     *委托备注——2022-11-10 16:54:32与房工讨论，由于派增派减两个委托备注，只能取派单表里的委托备注，社保公积金的委托备注字段废弃
      **/
     @ExcelAttribute(name = "委托备注",needExport = true)
 	@HeadFontStyle(fontHeightInPoints = 11)

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java

@@ -386,7 +386,7 @@ public class SocialHandleExportVo implements Serializable {
 	private BigDecimal personalBigailmentMoney;
 	/**
 	 *
-	 *委托备注
+	 *委托备注——2022-11-10 16:54:32与房工讨论，由于派增派减两个委托备注，只能取派单表里的委托备注，社保公积金的委托备注字段废弃
 	 **/
 	@ExcelAttribute(name = "委托备注",needExport = true)
 	@Schema(description = "委托备注")

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -786,7 +786,7 @@
 		s.UNIT_BIGAILMENT_CARDINAL,
 		s.UNIT_BIGAILMENT_MONEY,
 		s.PERSONAL_BIGAILMENT_MONEY,
-		s.TRUST_REMARK,
+		a.TRUST_REMARK,
 		a.REDUCE_REASON
 		<include refid="where_getSocialRecordRoster"/>
 	</select>
@@ -846,7 +846,7 @@
 		f.FUND_PROVINCE,
 		f.FUND_CITY,
 		f.FUND_TOWN,
-		f.TRUST_REMARK
+		a.TRUST_REMARK
 		<include refid="where_getFundRecord"/>
 	</select>