Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountExportVo.java

@@ -114,7 +114,7 @@ public class TSalaryAccountExportVo {
 	/**
 	 * 支出信息结算状态 0 已结算 1 结算中 2 未结算
 	 */
-	@Schema(description = "支出信息结算状态")
+	@ExcelProperty("支出结算状态")
 	private String paySettleFlag;
 
 }

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -815,7 +815,7 @@
 		<where>
 			a.DELETE_FLAG = 0
 			<include refid="where_export"/>
-			GROUP BY a.EMP_IDCARD ORDER BY a.CREATE_TIME desc
+			GROUP BY a.id ORDER BY a.CREATE_TIME desc
 			<if test="searchVo != null">
 				<if test="searchVo.limitStart != null">
 					limit #{searchVo.limitStart},#{searchVo.limitEnd}