conflict fixed

litemall-core/src/main/resources/notify.properties

+# 邮件发送配置
+sprint.mail.enable=false
+spring.mail.host=smtp.exmail.qq.com
+spring.mail.username=xxxxxx
+spring.mail.password=xxxxxx
+spring.mail.sendto=example@qq.com
+
+# 短信发送配置
+spring.sms.enable=false
+spring.sms.appid=111111
+spring.sms.appkey=xxxxxx
+spring.sms.sign=xxxxxx
+
+# 短信模板消息配置
+# 请在腾讯短信平台配置通知消息模板，然后这里设置不同短信模板ID
+# 请参考LitemallNotifyService.notifySMSTemplate
+spring.sms.template.paySucceed=111111
+spring.sms.template.captcha=222222
+
+# \u53D1\u9001\u7EBF\u7A0B\u6C60\u914D\u7F6E
+spring.notify.corePoolSize=5
+spring.notify.maxPoolSize=100
+spring.notify.queueCapacity=50
\ No newline at end of file