src/main/java/com/yxproject/start/entity · 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
..
accu		Loading commit data...
prod		Loading commit data...
CardBodyEntity.java		Loading commit data...
CityDicEntity.java		Loading commit data...
CountyListEntity.java		Loading commit data...
FailedCardEntity.java		Loading commit data...
GroupNoEntity.java		Loading commit data...
PoliceStationApplyReasonEntity.java		Loading commit data...
PoliceStationVailedEntity.java		Loading commit data...
SpecialCardEntity.java		Loading commit data...
SysPermission.java		Loading commit data...
SysRole.java		Loading commit data...
TaskEntity.java		Loading commit data...
UserInfo.java		Loading commit data...