Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	iam/src/main/java/com/baiyue/iam/dto/TenantDtos.java
#	iam/src/main/java/com/baiyue/iam/entity/IamTenant.java
#	iam/src/main/java/com/baiyue/iam/service/TenantService.java
#	iam/src/main/resources/db/iam.sql

iam/src/main/resources/db/phase1-customer-profile-fields.sql

@@ -0,0 +1,12 @@
+-- 平台客户档案原型字段补齐，可重复执行。
+USE baiyue_iam;
+
+SET @add_customer_columns = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns
+         WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'service_package'),
+  'SELECT 1',
+  'ALTER TABLE iam_tenant ADD COLUMN service_package VARCHAR(64) NULL COMMENT ''客户服务套餐'' AFTER contact_email, ADD COLUMN credit_days INT NOT NULL DEFAULT 0 COMMENT ''账期天数'' AFTER service_package, ADD COLUMN sales_person VARCHAR(64) NULL COMMENT ''负责销售人员'' AFTER credit_days, ADD COLUMN business_address VARCHAR(255) NULL COMMENT ''企业经营地址'' AFTER sales_person, ADD COLUMN remark VARCHAR(500) NULL COMMENT ''平台客户备注'' AFTER business_address'
+);
+PREPARE add_customer_columns_stmt FROM @add_customer_columns;
+EXECUTE add_customer_columns_stmt;
+DEALLOCATE PREPARE add_customer_columns_stmt;