yd-api/src/main/resources/mapper · 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
..
agms		Loading commit data...
commission		Loading commit data...
customer		Loading commit data...
lifecommission		Loading commit data...
marketing		Loading commit data...
meta		Loading commit data...
order		Loading commit data...
product		Loading commit data...
sms		Loading commit data...
survey		Loading commit data...
tencent		Loading commit data...
transaction		Loading commit data...
user		Loading commit data...