解决冲突
authorqiaowei <jov123@163.com>
Fri, 12 Apr 2019 02:23:34 +0000 (10:23 +0800)
committerqiaowei <jov123@163.com>
Fri, 12 Apr 2019 02:23:34 +0000 (10:23 +0800)
commitb9422a66294edd6d8a23223b2fddf43859412f6f
tree05f048f5f178bef78e30fb861c7002006df79f43
parentc647ec1dca1879776e413cd95f796dd408d385e4
解决冲突
src/main/java/com/supwisdom/dlpay/consume/dao/DpsdtlDao.java [deleted file]
src/main/java/com/supwisdom/dlpay/consume/domain/TDpsdtl.java [deleted file]
src/main/java/com/supwisdom/dlpay/consume/domain/TPerson.java
src/main/java/com/supwisdom/dlpay/consume/domain/TTransdtlOrder.java [deleted file]
src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java
src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt