Merge remote-tracking branch 'origin/develop' into plugin

Browse Source

# Conflicts:
#	radar-dal/src/main/java/com/pgmmers/radar/enums/PluginType.java

...

This commit is contained in:

wangcheng

2020-05-21 11:36:15 +08:00

parent 0494ad907a b47ecf8803

commit 8c3d14de4b

81 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/AbstractionQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/AbstractionQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/ActivationQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/ActivationQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/DataListQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/DataListQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/DataListRecordQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/DataListRecordQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/EventExportQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/EventExportQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/EventQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/EventQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/FieldQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/FieldQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/MerchantAccountQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/MerchantAccountQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/ModelQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/ModelQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/PageQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/PageQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/PageResult.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/PageResult.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/PreItemQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/PreItemQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/RuleHistoryQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/RuleHistoryQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/RuleQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/RuleQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/TermQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/TermQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/bean/UserQuery.java → radar-dal/src/main/java/com/pgmmers/radar/dal/bean/UserQuery.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/data/MobileInfoDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/data/MobileInfoDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/data/impl/MobileInfoDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/data/impl/MobileInfoDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/logs/RiskAnalysisResultDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/logs/RiskAnalysisResultDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/logs/impl/RiskAnalysisResultDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/logs/impl/RiskAnalysisResultDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/AbstractionDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/AbstractionDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/ActivationDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/ActivationDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/DataListDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/DataListDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/FieldDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/FieldDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/ModelConfDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/ModelConfDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/ModelDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/ModelDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/PreItemDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/PreItemDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/RuleDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/RuleDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/UserDal.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/UserDal.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/AbstractionDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/AbstractionDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/ActivationDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/ActivationDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/DataListDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/DataListDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/FieldDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/FieldDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/ModelConfDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/ModelConfDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/ModelDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/ModelDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/PreItemDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/PreItemDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/RuleDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/RuleDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/UserDalImpl.java → radar-dal/src/main/java/com/pgmmers/radar/dal/model/impl/UserDalImpl.java

0

radar-dal/src/main/java/com.pgmmers.radar/enums/AggregateType.java → radar-dal/src/main/java/com/pgmmers/radar/enums/AggregateType.java

0

radar-dal/src/main/java/com.pgmmers.radar/enums/CombineType.java → radar-dal/src/main/java/com/pgmmers/radar/enums/CombineType.java

0

radar-dal/src/main/java/com.pgmmers.radar/enums/DataListType.java → radar-dal/src/main/java/com/pgmmers/radar/enums/DataListType.java

0

radar-dal/src/main/java/com.pgmmers.radar/enums/DateType.java → radar-dal/src/main/java/com/pgmmers/radar/enums/DateType.java

0

radar-dal/src/main/java/com.pgmmers.radar/enums/FieldType.java → radar-dal/src/main/java/com/pgmmers/radar/enums/FieldType.java

0

radar-dal/src/main/java/com.pgmmers.radar/enums/Operator.java → radar-dal/src/main/java/com/pgmmers/radar/enums/Operator.java

0

radar-dal/src/main/java/com.pgmmers.radar/enums/ResultCode.java → radar-dal/src/main/java/com/pgmmers/radar/enums/ResultCode.java

0

radar-dal/src/main/java/com.pgmmers.radar/enums/StatusType.java → radar-dal/src/main/java/com/pgmmers/radar/enums/StatusType.java

0

radar-dal/src/main/java/com.pgmmers.radar/enums/ValidateType.java → radar-dal/src/main/java/com/pgmmers/radar/enums/ValidateType.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/AbstractionMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/AbstractionMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/ActivationMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/ActivationMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/BaseMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/BaseMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/DataListMetaMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/DataListMetaMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/DataListRecordMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/DataListRecordMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/DataListsMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/DataListsMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/FieldMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/FieldMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/MobileInfoMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/MobileInfoMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/ModelMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/ModelMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/PreItemMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/PreItemMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/RuleHistoryMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/RuleHistoryMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/RuleMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/RuleMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/mapstruct/UserMapping.java → radar-dal/src/main/java/com/pgmmers/radar/mapstruct/UserMapping.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/admin/UserVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/admin/UserVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/common/FieldValueVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/common/FieldValueVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/common/PageVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/common/PageVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/common/PluginVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/common/PluginVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/data/MobileInfoVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/data/MobileInfoVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/logs/RiskAnalysisResultVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/logs/RiskAnalysisResultVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/AbstractionVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/AbstractionVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/AbstractionVO2.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/AbstractionVO2.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/ActivationVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/ActivationVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/DataListMetaVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/DataListMetaVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/DataListRecordVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/DataListRecordVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/DataListsVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/DataListsVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/EntityVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/EntityVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/FieldVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/FieldVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/ModelConfParamVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/ModelConfParamVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/ModelConfVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/ModelConfVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/ModelVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/ModelVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/PreItemVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/PreItemVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/RuleHistoryVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/RuleHistoryVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/RuleHitsVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/RuleHitsVO.java

0

radar-dal/src/main/java/com.pgmmers.radar/vo/model/RuleVO.java → radar-dal/src/main/java/com/pgmmers/radar/vo/model/RuleVO.java