agent.git - Gitblit

wzy

2020-10-15 ec74f248ddac773a6024a243a37346bd2e9bb028

refs
author	wzy <wzy19931122ai@163.com>
	Thursday, October 15, 2020 23:46 +0800
committer	wzy <wzy19931122ai@163.com>
	Thursday, October 15, 2020 23:46 +0800
commit	ec74f248ddac773a6024a243a37346bd2e9bb028
tree	1a0e94d2c0629ef5932dad89973c7bdbae9f39f4 tree \| zip \| gz
parent	089a6010a74bf128d1025968284fdfa9cd35adfd view \| diff 766809fd2a74e23170cc567311e2a06d70d9febe view \| diff

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

9 files modified

1 files deleted

	src/main/java/com/xcong/excoin/system/entity/User.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/application-dev.yml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/application-prod.yml	14 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/logback-spring.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/modules/MemberMapper.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/static/febs/images/favicon.ico	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	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/agent/agentAdd.html	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/index.html	2 ●●●●● diff \| view \| raw \| blame \| history