Merge remote-tracking branch 'refs/remotes/origin/master' into feature/payment-apply-bfi-sync

# Conflicts: # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
2026-10-01 13:47:00 +08:00
parent 27756ba964 a5e89aa6dc
commit 4b3edf977c
206 changed files with 4885 additions and 4913 deletions
@@ -138,6 +138,12 @@ public class Dept extends TenantEntity {
 	@Schema(description = "部门编码")
 	private String deptCode;

+	/**
+	 * 金蝶部门代码
+	 */
+	@Schema(description = "金蝶部门代码")
+	private String kingdeeDeptCode;
+
 	/**
 	 * 组织简称
 	 */
@@ -52,6 +52,13 @@ public class AirportMasterVO extends AirportMaster {
 	@Schema(description = "导入错误信息")
 	private String errorMessage;

+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	/**
 	 * 更新人姓名
 	 */
@@ -49,6 +49,10 @@ public class FeeItemVO extends FeeItem {
 	@Schema(description = "组织")
 	private String createDeptName;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	@TableField(exist = false)
 	@Schema(description = "更新人")
 	private String updateUserName;
@@ -52,6 +52,13 @@ public class PortTerminalVO extends PortTerminal {
 	@Schema(description = "导入错误信息")
 	private String errorMessage;

+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	/**
 	 * 更新人姓名
 	 */
@@ -52,6 +52,13 @@ public class RailwayStationVO extends RailwayStation {
 	@Schema(description = "导入错误信息")
 	private String errorMessage;

+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	/**
 	 * 更新人姓名
 	 */