• lizhichao's avatar
    Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/precision-effect · 772ee3d2
    lizhichao authored
     Conflicts:
    	precision-effect-admin/src/main/java/com/zehong/web/controller/transaction/TTradeProjectController.java
    	precision-effect-system/src/main/java/com/zehong/system/mapper/TTradeProjectMapper.java
    	precision-effect-system/src/main/java/com/zehong/system/service/ITTradeProjectService.java
    	precision-effect-system/src/main/java/com/zehong/system/service/impl/TTradeProjectServiceImpl.java
    	precision-effect-system/src/main/resources/mapper/business/TTradeProjectMapper.xml
    772ee3d2
TTradeProjectMapper.java 1.65 KB