gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在本地合并冲突

Browse Source
This commit is contained in:
RenKaiGe-Office
2018-05-29 15:36:42 +08:00
parent 7a9853d77f
commit 51456e5554
15 changed files with 757 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/restful/ConfigTestController.java
View File

@@ -584,9 +584,9 @@ public class ConfigTestController extends BaseRestController {
configCompile.setContLabel("0");
configCompile.setTaskId(0);
configCompile.setGuaranteeId(0);
configCompile.setAffAirId(0);
configCompile.setTopIcId(0);
configCompile.setDoBlackList(0l);
configCompile.setAffairId(0);
configCompile.setTopicId(0);
configCompile.setDoBlacklist(0l);
configCompile.setDoLog(0);
configCompile.setEffectiveRange("0");
configCompile.setConfigPercent(100l);