将common项目拆分为多个子项目，只保留了标签部分
Merge branch 'master' of https://github.com/bcw104/scada-common

Conflicts:
	src/main/java/com/ht/scada/common/data/FaultRecord.java
	src/main/java/com/ht/scada/common/data/OffLimitsRecord.java
	src/main/java/com/ht/scada/common/data/YCData.java
	src/main/java/com/ht/scada/common/data/YMData.java
	src/main/java/com/ht/scada/common/data/YXData.java
	src/main/java/com/ht/scada/common/data/entity/DailyOilProduct.java
	src/main/java/com/ht/scada/common/data/entity/FaultDiagnoseRecord.java
	src/main/java/com/ht/scada/common/data/entity/HourlyOilProduct.java
	src/main/java/com/ht/scada/common/data/entity/MonthlyOilProduct.java
	src/main/java/com/ht/scada/common/data/entity/WellDailyCompositeInfo.java
	src/main/java/com/ht/scada/common/data/entity/WellStatusRecord.java
	src/main/java/com/ht/scada/common/data/service/BaseDataService.java
	src/main/java/com/ht/scada/common/data/service/RealtimeDataService.java
	src/main/java/com/ht/scada/common/data/service/impl/BaseDataServiceImpl.java
	src/main/java/com/ht/scada/common/data/service/impl/RealtimeDataServiceImpl.java
	src/main/java/com/ht/scada/common/tag/entity/EndTag.java
	src/main/java/com/ht/scada/common/tag/entity/VarGroupCfg.java
	src/main/java/com/ht/scada/common/tag/service/TagService.java
	src/main/java/com/ht/scada/common/tag/service/impl/TagServiceImpl.java
	src/main/java/com/ht/scada/common/tag/util/ChannelFrameFactory.java
	src/main/java/com/ht/scada/common/tag/util/DataType.java
	src/main/java/com/ht/scada/common/user/dao/MenuItemDao.java
	src/main/java/com/ht/scada/common/user/dao/MenuTypeDao.java
	src/main/java/com/ht/scada/common/user/dao/UserDao.java
	src/main/java/com/ht/scada/common/user/dao/UserExtInfoDao.java
	src/main/java/com/ht/scada/common/user/dao/UserRoleDao.java
	src/main/java/com/ht/scada/common/user/entity/MenuItem.java
	src/main/java/com/ht/scada/common/user/entity/MenuType.java
	src/main/java/com/ht/scada/common/user/entity/User.java
	src/main/java/com/ht/scada/common/user/entity/UserExtInfo.java
	src/main/java/com/ht/scada/common/user/entity/UserRole.java
	src/main/java/com/ht/scada/common/user/service/MenuService.java
	src/main/java/com/ht/scada/common/user/service/UserService.java
	src/main/java/com/ht/scada/common/user/service/impl/MenuServiceImpl.java
	src/main/java/com/ht/scada/common/user/service/impl/UserServiceImpl.java
编辑冲突