src/main/java/cn/wisenergy/chnmuseum/party/mapper · 540a676bbac2c0e79b3a4ea8d95e3ce98d1a3fa7 · liqin / chnmuseum-party

Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party · a542b4dc
jiawei authored Mar 31, 2021
```
 Conflicts:
	src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java
```
a542b4dc

Name	Last commit	Last update
..
AssetMapper.java		Loading commit data...
AssetTypeMapper.java		Loading commit data...
AuditMapper.java		Loading commit data...
BankBranchInfoMapper.java		Loading commit data...
BoardPlayRankMapper.java		Loading commit data...
BoardPlayTrendMapper.java		Loading commit data...
BoardTalkingMapper.java		Loading commit data...
BusinessInfoMapper.java		Loading commit data...
CopyrightOwnerAssetTypeMapper.java		Loading commit data...
CopyrightOwnerBoardTypeMapper.java		Loading commit data...
CopyrightOwnerMapper.java		Loading commit data...
DemandInfoMapper.java		Loading commit data...
DistrictBoardStatisticMapper.java		Loading commit data...
EmployeeMapper.java		Loading commit data...
EmployeeRoleMapper.java		Loading commit data...
ExhibitionBoardCatMapper.java		Loading commit data...
ExhibitionBoardMapper.java		Loading commit data...
HotProductActivityMapper.java		Loading commit data...
HotSpotMapper.java		Loading commit data...
IndexMapper.java		Loading commit data...
InteractionRankMapper.java		Loading commit data...
LearningContentBoardCatMapper.java		Loading commit data...
LearningContentBoardMapper.java		Loading commit data...
LearningContentCopyrightOwnerMapper.java		Loading commit data...
LearningContentMapper.java		Loading commit data...
LearningProjectMapper.java		Loading commit data...
MenuMapper.java		Loading commit data...
PageViewRecordMapper.java		Loading commit data...
PageViewsMapper.java		Loading commit data...
PermissionInitMapper.java		Loading commit data...
PermissionMapper.java		Loading commit data...
ProductAppointmentRecordMapper.java		Loading commit data...
RoleMapper.java		Loading commit data...
RoleMenuMapper.java		Loading commit data...
RolePermissionMapper.java		Loading commit data...
RunLogMapper.java		Loading commit data...
StatisticMapper.java		Loading commit data...
SysLogMapper.java		Loading commit data...
TAppDirPicMapper.java		Loading commit data...
TAppRunPicMapper.java		Loading commit data...
TAppVersionMapper.java		Loading commit data...
TAreaMapper.java		Loading commit data...
TBoardPlayRankMapper.java		Loading commit data...
TBoardPlayTrendMapper.java		Loading commit data...
TBoardStatisticMapper.java		Loading commit data...
TBoxOperationMapper.java		Loading commit data...
TCourseBoardLinkMapper.java		Loading commit data...
TDistrictBoardStatisticMapper.java		Loading commit data...
TInteractionMapper.java		Loading commit data...
TItemMapper.java		Loading commit data...
TOperationLogMapper.java		Loading commit data...
TOrganMapper.java		Loading commit data...
TUserMapper.java		Loading commit data...
TUserRoleMapper.java		Loading commit data...