Merge remote-tracking branch 'origin/master'

src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java

@@ -66,7 +66,7 @@ public class SocialItemService extends BaseService {
         }
         if(!codeList.isEmpty()){
             QueryWrapper<SocialItem> queryWrapper = new QueryWrapper<>();
-            queryWrapper.in("social_code", codeList);
+            queryWrapper.in("code", codeList);
             socialItemMapper.delete(queryWrapper);
         }
 

src/main/resources/application.yml

@@ -10,15 +10,6 @@ spring:
     url: jdbc:postgresql://dev.jizhiweb.cn:15321/syjiaer_clinic
     username: postgres
     password: i7L0BS91pADGuy7z
-    hikari:
-      maximum-pool-size: 10
-      minimum-idle: 5
-      idle-timeout: 300000
-      max-lifetime: 1800000
-      connection-timeout: 30000
-      leak-detection-threshold: 60000
-      initialization-fail-timeout: 60000
-      keepalive-time: 30000
   config:
     import: optional:classpath:developer-config.yml
 server: