Merge branch 'update' into develop

7 years ago · c0d3e4a787
parent 1067641ec3 d930511e61
commit c0d3e4a787
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@ -1446,7 +1446,7 @@ public class RetailAppServiceImp implements RetailAppService {
    @Override
    public void changeManualSettle(JSONObject device, boolean manual_settle) {
-        clientManager.changeManualSettle(device.getIntValue("client_id"), manual_settle, device.getString("account_id"), 1, "商户修改手动清算配置");
+        clientManager.changeManualSettle(device.getIntValue("client_id"), manual_settle, device.getString("account_id"), 1, "商户"+(manual_settle?"打开":"关闭")+"手动清算");
    }