diff --git a/config/application-devel-pg.properties b/config/application-devel-pg.properties
index 61b2df9..61c327f 100644
--- a/config/application-devel-pg.properties
+++ b/config/application-devel-pg.properties
@@ -24,8 +24,19 @@
 security.request.sign=false
 ##################################################
 ## quartz task scheduler
-<<<<<<< HEAD
 shopbalance.updater.cron=-
-=======
-shopbalance.updater.cron = -
->>>>>>> 手机端API认证
+
+##################多租户配置 start################################
+#多租户时使用的配置，如果不是用多租户，以下可注释掉
+#spring.jpa.properties.hibernate.multiTenancy=DATABASE
+#spring.jpa.properties.hibernate.tenant_identifier_resolver=com.supwisdom.dlpay.framework.tenant.MultiTenantIdentifierResolver
+#spring.jpa.properties.hibernate.multi_tenant_connection_provider=com.supwisdom.dlpay.framework.tenant.MultiTenantConnectionProviderImpl
+#datasource.driverClass=org.postgresql.Driver
+#datasource.url=jdbc:postgresql://172.28.201.70:15432/payapi
+#datasource.username=payapi
+#datasource.password=123456
+#datasource.maxActive=100
+#datasource.maxIdle=30
+#datasource.maxWait=30
+#datasource.minIdle=5
+##################多租户配置 end################################
\ No newline at end of file