src/main/java/com/hp/cmsz/entity · 38de5b1923fec4152fc99641c9cfadf45ab1f2b1 · liuna / cmszMonitorAnalysis

Merge remote-tracking branch 'origin/master' into moly · 38de5b19

authored Dec 04, 2017

# Conflicts:
#	src/main/java/com/hp/cmsz/entity/DimKpi.java
#	src/main/java/com/hp/cmsz/repository/BusinessDao.java

38de5b19

Name	Last commit	Last update
..
commonmanage		Loading commit data...
APPEWarningDetail.java		Loading commit data...
AccuracyRule.java		Loading commit data...
AnalysisType.java		Loading commit data...
AnalysisTypeDsCMap.java		Loading commit data...
AppData.java		Loading commit data...
BacType.java		Loading commit data...
Business.java		Loading commit data...
ChangeOrder.java		Loading commit data...
Channel.java		Loading commit data...
ChannelDataSourceMap.java		Loading commit data...
City.java		Loading commit data...
CmszOperationLog.java		Loading commit data...
CompetitorsBusiness.java		Loading commit data...
CrawlAlexaData.java		Loading commit data...
CrawlAlexaDetailData.java		Loading commit data...
CrawlAppData.java		Loading commit data...
CrawlDataComment.java		Loading commit data...
CrawlForumData.java		Loading commit data...
CrawlKeyWord.java		Loading commit data...
CrawlMallData.java		Loading commit data...
CrawlMobileData.java		Loading commit data...
CrawlRunTask.java		Loading commit data...
CrawlSearchData.java		Loading commit data...
CrawlTwitterData.java		Loading commit data...
CrawlUrlData.java		Loading commit data...
CrawlUrlKeyMapData.java		Loading commit data...
DataModel.java		Loading commit data...
DataModelType.java		Loading commit data...
DataModelView.java		Loading commit data...
DataSource.java		Loading commit data...
DataType.java		Loading commit data...
Department.java		Loading commit data...
DeployedServer.java		Loading commit data...
DimAssociationAnaInfo.java		Loading commit data...
DimKpi.java		Loading commit data...
DimKpiAssociationRelInfo.java		Loading commit data...
DimReasonSubType.java		Loading commit data...
EventKind.java		Loading commit data...
EventSubOrigin.java		Loading commit data...
Failure.java		Loading commit data...
FailureAddition.java		Loading commit data...
FailureAttachment.java		Loading commit data...
FilterRule.java		Loading commit data...
FxjmDataModelInfoT.java		Loading commit data...
GjfxDetailInfo.java		Loading commit data...
GjfxRelatedInsideWorkingOrder.java		Loading commit data...
GjfxWarningInfo.java		Loading commit data...
Granularity.java		Loading commit data...
GzfxDetailInfo.java		Loading commit data...
ImportanceLevel.java		Loading commit data...
InfluenceAnalysis.java		Loading commit data...
InfluenceAnalysisView.java		Loading commit data...
InsideXcdWorkingOrderInfo.java		Loading commit data...
InsideXcdWorkingOrderInfoView.java		Loading commit data...
KeyBusiness.java		Loading commit data...
KeyLink.java		Loading commit data...
KnowledgeDocType.java		Loading commit data...
KnowledgeSource.java		Loading commit data...
KnowledgeType.java		Loading commit data...
Kpi.java		Loading commit data...
KpiCycleType.java		Loading commit data...
KpiType.java		Loading commit data...
ModelParameter.java		Loading commit data...
Month.java		Loading commit data...
NetElement.java		Loading commit data...
Priority.java		Loading commit data...
Privilege.java		Loading commit data...
ProcessTimeRange.java		Loading commit data...
Provider.java		Loading commit data...
Province.java		Loading commit data...
ProvinceVersionConfig.java		Loading commit data...
PzxAttributeValueView.java		Loading commit data...
PzxChangInfo.java		Loading commit data...
PzxChangeInfo.java		Loading commit data...
PzxCiAttributeInfo.java		Loading commit data...
PzxCiCategory.java		Loading commit data...
PzxCiRelation.java		Loading commit data...
PzxDetailInfoView.java		Loading commit data...
QualityRule.java		Loading commit data...
QualityRuleInfo.java		Loading commit data...
QualityRuleView.java		Loading commit data...
ReasonType.java		Loading commit data...
RiskEarlyWarning.java		Loading commit data...
RoleInfo.java		Loading commit data...
Stat.java		Loading commit data...
SystemFunction.java		Loading commit data...
SystemParameter.java		Loading commit data...
TSWB_FocusData.java		Loading commit data...
TSWB_YZDetailData.java		Loading commit data...
TSWB_YZFocusData.java		Loading commit data...
TSWB_YZLiabilityData.java		Loading commit data...
TSWB_YZTemplateData.java		Loading commit data...
Time.java		Loading commit data...
UserInfo.java		Loading commit data...
UserRoleInfo.java		Loading commit data...
WarningSource.java		Loading commit data...
XcdChangeOrder.java		Loading commit data...
XcdChangeView.java		Loading commit data...
XcdDetailInfoView.java		Loading commit data...
XcdWarningInfoView.java		Loading commit data...
XcdWoRelatedModel.java		Loading commit data...
XcdWorkingOrderInfo.java		Loading commit data...
YWTZAnalysisData.java		Loading commit data...
YwglBusRegularity.java		Loading commit data...
YwglEwarningBusDataView.java		Loading commit data...
YwglKeyLinkProcess.java		Loading commit data...
YwglKeyLinkProcessView.java		Loading commit data...
YwtzBusinessQuantityInfo.java		Loading commit data...