yd-api/src/main/resources · 9d6ad47e374a361b993e749c6f3371b3cf2016da · AutogeneralShanghai / yd-backend

Merge remote-tracking branch 'origin/dev_20201104_CommissionCheck' into… · 9d6ad47e

Merge remote-tracking branch 'origin/dev_20201104_CommissionCheck' into dev_20201104_CommissionCheck

# Conflicts:
#	yd-api/src/main/java/com/yd/api/agms/service/AgmsFortuneService.java
#	yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
#	yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsFortuneDALServiceImpl.java

committed Nov 17, 2020

9d6ad47e

Name	Last commit	Last Update
..
i18n		Loading commit data...
mapper		Loading commit data...
static		Loading commit data...
application-dev.properties		Loading commit data...
application-local.properties		Loading commit data...
application.properties		Loading commit data...
logback-spring.xml		Loading commit data...
persistence.properties		Loading commit data...