# Conflicts: # src/main/java/com/zzsn/thinktank/controller/ThinktankBasicInfoController.java # src/main/java/com/zzsn/thinktank/entity/ThinktankBasicInfo.java # src/main/java/com/zzsn/thinktank/mapper/ThinktankBasicInfoMapper.java # src/main/java/com/zzsn/thinktank/service/ThinktankBasicInfoService.java # src/main/java/com/zzsn/thinktank/service/impl/ThinktankBasicInfoServiceImpl.java # src/main/java/com/zzsn/thinktank/vo/ThinktankBasicInfoListVo.java # src/main/resources/application.yml
