Merge branch 'master' of http://1.95.212.35:13000/root/equity-java

# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/src/main/java/com/ruoyi/common/exception/user/OnlyOneMainCompanyAllowedException.java
#	ruoyi-common/src/main/java/com/ruoyi/common/exception/user/urNotshareholderException.java
#	ruoyi-equity/src/main/java/com/ruoyi/equity/controller/BecomeShareholderRecordController.java
#	ruoyi-equity/src/main/java/com/ruoyi/equity/controller/EquityTransferRecordController.java
#	ruoyi-equity/src/main/java/com/ruoyi/equity/mapper/BecomeShareholderRecordMapper.java
#	ruoyi-equity/src/main/java/com/ruoyi/equity/mapper/EquityTransferRecordMapper.java
#	ruoyi-equity/src/main/java/com/ruoyi/equity/service/IBecomeShareholderRecordService.java
#	ruoyi-equity/src/main/java/com/ruoyi/equity/service/IEquityTransferRecordService.java
#	ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/BecomeShareholderRecordServiceImpl.java
#	ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/EquityTransferRecordServiceImpl.java
#	ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/ShareholderInfoServiceImpl.java
#	ruoyi-equity/src/main/resources/mapper/equity/BecomeShareholderRecordMapper.xml
#	ruoyi-equity/src/main/resources/mapper/equity/EquityChangeRecordMapper.xml
#	ruoyi-equity/src/main/resources/mapper/equity/EquityMessageRecordMapper.xml
#	ruoyi-equity/src/main/resources/mapper/equity/EquityTransferRecordMapper.xml
#	ruoyi-equity/src/main/resources/mapper/equity/SendMessageRecordMapper.xml
#	ruoyi-equity/src/main/resources/mapper/equity/ShareholderInfoMapper.xml