Merge branch 'gifaeture/20211105-gj' into 'master'

Gifaeture/20211105 gj See merge request test-group/kejiji!164

Merge branch 'gifaeture/20211105-gj' into 'master'
Gifaeture/20211105 gj See merge request test-group/kejiji!164
8e85ed8b · 龚小红 · 68711478 · 344c8df7 · 8e85ed8b · 8e85ed8b
Commit 8e85ed8b authored Nov 15, 2021 by 龚小红
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 86 additions and 12 deletions

DesignatedWinner.java ...est/java/com/kjj/cases/live/lottery/DesignatedWinner.java +85 -11

BasicConfig.java src/test/java/com/kjj/config/BasicConfig.java +1 -1

No files found.
--- a/src/test/java/com/kjj/cases/live/lottery/DesignatedWinner.java
+++ b/src/test/java/com/kjj/cases/live/lottery/DesignatedWinner.java
--- a/src/test/java/com/kjj/config/BasicConfig.java
+++ b/src/test/java/com/kjj/config/BasicConfig.java
@@ -387,7 +387,7 @@ public class BasicConfig {
  public static final String MOBILE_agentSpecifyAwardInfo = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardInfo";
  public static final String MOBILE_agentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf";
  public static final String MANAGER_confSwitchStatus = MANAGER_HOST + "/kjy/manager/specifyAward/pre/conf/switchStatus";
-
+  public static final String MANAGER_confImport = MANAGER_HOST + "/kjy/manager/specifyAward/pre/conf/import";
  // *************** 直播中抽奖 ***************
  public static final String USER_getLiveAwardList = MOBILE_HOST + "/conf/pre/specifyAward/getLiveAwardList";
  public static final String USER_listLiveLottery = MOBILE_HOST + "/kjy/live/lottery/listLiveLottery";