exchange-back.git

xiaoyong931011

2020-10-11 13c6892c31496e7e9ac76ca439a09d405834ecfb

refs
author	xiaoyong931011 <15274802129@163.com>
	Sunday, October 11, 2020 16:47 +0800
committer	xiaoyong931011 <15274802129@163.com>
	Sunday, October 11, 2020 16:47 +0800
commit	13c6892c31496e7e9ac76ca439a09d405834ecfb
tree	7c3fc1f69e23772be3a606d98c6e265f1592e0ea tree \| zip \| gz
parent	56f74569e3e1b981f6b8a3ace675f90f0766b90f view \| diff 8d71bd520526bd07bf8a54ed37fa135870709a4d view \| diff

Merge branch 'master' of
https://gitee.com/chonggaoxiao/new_excoin_manage.git

Conflicts:
	src/main/resources/application-dev.yml

11 files modified

	.gitignore	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/Sms106Send.java	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/application-prod.yml	14 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/error/403.html	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/error/404.html	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/error/500.html	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/index.html	3 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/layout.html	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/login.html	20 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/member/memberDetail.html	10 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/index.html	2 ●●●●● diff \| view \| raw \| blame \| history