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

无关风月

昨天 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

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

@@ -46,7 +46,7 @@
    private ITSiteService siteService;
    @Autowired
    private TOperatorService operatorService;
    private String PREFIX = "/system/vip/";
    private String PREFIX = "/system/vipDetail/";


    /**