master
wangning 7 years ago
commit 674235960d

@ -408,7 +408,7 @@ public class RetailAppController {
}
@RequestMapping(value = "/manual_settle", method = RequestMethod.PUT)
@RequestMapping(value = "/client/manual_settle", method = RequestMethod.PUT)
public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device,@RequestParam boolean manual_settle) {
retailAppService.changeManualSettle(device,manual_settle);
}

@ -320,7 +320,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
"company_name", "address","business_name","business_structure", "abn","acn","company_phone","suburb","postcode","state","contact_person","contact_phone","contact_email",
"short_name", "logo_url", "enable_refund", "enable_refund_auth", "retail_surcharge", "require_custinfo", "require_remark",
"logo_thumbnail", "creator", "create_time", "approver", "approve_result", "approve_time", "timezone",
"has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat", "enable_bestpay"};
"has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat", "enable_bestpay","manual_settle"};
for (String col : columns) {
simpleClient.put(col, client.get(col));
}

Loading…
Cancel
Save