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

6 years ago · 22bb45a1e7
parent 8cd3940c7c 0c954ac7ac
commit 22bb45a1e7
1 changed files with 6 additions and 0 deletions
--- a/src/main/ui/static/analysis/templates/cheat_monitor_risk.html
+++ b/src/main/ui/static/analysis/templates/cheat_monitor_risk.html
@ -344,6 +344,12 @@
                                <input class="form-control" ng-model="paymentconfig['cheat_monitor.no_disturbing']">
                            </div>
                        </div>
+                        <div class="form-group col-sm-6">
+                            <label class="control-label col-sm-5">白名单:</label>
+                            <div class="col-sm-6">
+                                <input class="form-control" ng-model="paymentconfig['cheat_monitor.white_list']">
+                            </div>
+                        </div>
                    </div>
                </div>
                <div class="col-sm-offset-4 col-sm-6">