Merge branch 'update' into develop

master
wangning 7 years ago
commit 808e0b0be5

@ -1559,17 +1559,17 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
JSONObject qrboardConfig = new JSONObject(); JSONObject qrboardConfig = new JSONObject();
qrboardConfig.put("src", PlatformEnvironment.getEnv().concatUrl("/static/images/aggregate_qr_board.png")); qrboardConfig.put("src", PlatformEnvironment.getEnv().concatUrl("/static/images/aggregate_qr_board.png"));
qrboardConfig.put("type", "royalpay"); qrboardConfig.put("type", "royalpay");
qrboardConfig.put("x", "825"); qrboardConfig.put("x", "845");
qrboardConfig.put("y", "1180"); qrboardConfig.put("y", "1260");
qrboardConfig.put("size", "770"); qrboardConfig.put("size", "770");
qrboardConfig.put("fontsize", "50"); qrboardConfig.put("fontsize", "50");
qrboardConfig.put("fontx", "1205"); qrboardConfig.put("fontx", "1245");
qrboardConfig.put("fonty", "1961"); qrboardConfig.put("fonty", "2041");
qrboardConfig.put("snsize", "50"); qrboardConfig.put("snsize", "50");
qrboardConfig.put("snx", "1205"); qrboardConfig.put("snx", "1225");
qrboardConfig.put("sny", "1210"); qrboardConfig.put("sny", "1290");
qrboardConfig.put("brandx", "900"); qrboardConfig.put("brandx", "940");
qrboardConfig.put("brandy", "950"); qrboardConfig.put("brandy", "1030");
qrboardConfig.put("brandw", "600"); qrboardConfig.put("brandw", "600");
qrboardConfig.put("brandh", "200"); qrboardConfig.put("brandh", "200");
String type = qrboardConfig.getString("type"); String type = qrboardConfig.getString("type");

Loading…
Cancel
Save