Merge branch 'develop'

master
yixian 5 years ago
commit 7a4ef214c8

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>au.com.royalpay.payment</groupId> <groupId>au.com.royalpay.payment</groupId>
<artifactId>payment-parent</artifactId> <artifactId>payment-parent</artifactId>
<version>2.2.7</version> <version>2.2.9</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>

@ -259,7 +259,7 @@ public class ATOReportServiceImpl implements ATOReportService {
} }
public static class Progress { public static class Progress {
private static final Logger logger = LoggerFactory.getLogger(ATOReportService.class); private static final Logger logger = LoggerFactory.getLogger(Progress.class);
private String brand; private String brand;
private String currentMonth; private String currentMonth;
private Map<Integer, Boolean> clientsStatus; private Map<Integer, Boolean> clientsStatus;
@ -271,7 +271,7 @@ public class ATOReportServiceImpl implements ATOReportService {
public Progress() { public Progress() {
status = "Init"; status = "Init";
server = PlatformEnvironment.getEnv().appName(); server = PlatformEnvironment.getEnv().appName(true);
} }
public String getBrand() { public String getBrand() {

Loading…
Cancel
Save