Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

liujie

4 天以前 dec64d47a9a3a3cc133afdf5141744d90fcb49b4

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipPaymentController.java

@@ -173,14 +173,13 @@
            }
            if (re.getOperatorId()!=null){
                if (re.getOperatorId()==0){
                    re.setOperatorName("总平台");
                    re.setOperatorName("平台");
                }else{
                    TOperator operator = operatorList.stream().filter(e -> e.getId().equals(re.getOperatorId())).findFirst().orElse(null);
                    if (operator!=null){
                        re.setOperatorName(operator.getName());
                    }
                }

            }
        }
        return res;