Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy

# Conflicts:
#	.gitignore
#	.idea/inspectionProfiles/Project_Default.xml
#	src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java
#	src/main/java/com/nq/controller/backend/AdminController.java
#	src/main/java/com/nq/controller/protol/UserController.java
#	src/main/java/com/nq/dao/ApplyLeverMapper.java
#	src/main/java/com/nq/enums/EStockType.java
#	src/main/java/com/nq/pojo/User.java
#	src/main/java/com/nq/pojo/reponse/RUserAssets.java
#	src/main/java/com/nq/service/IPriceServices.java
#	src/main/java/com/nq/service/impl/ApplyLeverServicesimpl.java
#	src/main/java/com/nq/service/impl/FileUploadServiceImpl.java
#	src/main/java/com/nq/service/impl/PriceServicesImpl.java
#	src/main/java/com/nq/service/impl/RateServicesImpl.java
#	src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
#	src/main/java/com/nq/service/impl/StockServiceImpl.java
#	src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
#	src/main/java/com/nq/service/impl/UserAssetsServices.java
#	src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
#	src/main/java/com/nq/service/impl/UserServiceImpl.java
#	src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
#	src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
#	src/main/java/com/nq/utils/task/stock/StockTask.java
#	src/main/java/com/nq/ws/HKWebsocketRunClient.java
#	src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
#	src/main/java/com/nq/ws/WebsocketRunClient.java
#	src/main/resources/application.properties
#	src/main/resources/application.yml
#	target/classes/application.properties
#	target/classes/application.yml
#	target/classes/mapper/SitePayMapper.xml
#	target/classes/mapper/StockDzMapper.xml
#	target/classes/mapper/UserMapper.xml
#	target/classes/mapper/UserRechargeMapper.xml
#	target/classes/mapper/UserWithdrawMapper.xml