src/main/resources/mapper · b53ecaf68f82822c8b972c93886df0aceecca6fc · zhangyusheng / YX_IDENT_REFACTORING

Merge remote-tracking branch 'origin/dev' into dev · b53ecaf6

Administrator authored Nov 20, 2018

# Conflicts:
#	src/main/java/com/yxproject/start/entity/CountyListInfoEntity.java
#	src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java

b53ecaf6

Name	Last commit	Last update
..
config		Loading commit data...
AccCardTMapper.xml		Loading commit data...
CardBodyMapper.xml		Loading commit data...
CountyListMapper.xml		Loading commit data...
FailedCardMapper.xml		Loading commit data...
GroupNoMapper.xml		Loading commit data...
PoliceStationApplyReasonMapper.xml		Loading commit data...
ProdCardTMapper.xml		Loading commit data...
SpecialCardMapper.xml		Loading commit data...
SysPermissionMapper.xml		Loading commit data...
SystemUserMapper.xml		Loading commit data...
TaskMapper.xml		Loading commit data...
UtilMapper.xml		Loading commit data...