From 5ca03cd829fa38fb3ff519f95f01727338f6e1c5 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 19 Oct 2020 10:03:22 +0800 Subject: [PATCH] . --- ssjygl-xsx-common/src/main/java/generator/Main.java | 1 + .../src/main/java/com/cowr/local/ssjygl/main/Config.java | 2 +- .../ssjygl/prepay/refunddetail/RefundDetailController.java | 2 +- .../ssjygl/prepay/refunddetail/RefundDetailController.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/generator/Main.java b/ssjygl-xsx-common/src/main/java/generator/Main.java index f0d6c60..46869ed 100644 --- a/ssjygl-xsx-common/src/main/java/generator/Main.java +++ b/ssjygl-xsx-common/src/main/java/generator/Main.java @@ -75,6 +75,7 @@ public class Main { "sms_log", "ossfile_log", "customer_pact", + "customer_supermarket_product", }; PropKit.use("db.properties"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 91927a3..5ae5084 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -91,7 +91,7 @@ public class Config extends JFinalConfig { public static DeviceThread deviceThread = new DeviceThread(); public static SocketIOService socketio = null; private static boolean client_run = true; - public static final String CLINET_VERSION = "20201017"; + public static final String CLINET_VERSION = "20201018"; public static String getRootPath() { return PathKit.getWebRootPath() diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/refunddetail/RefundDetailController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/refunddetail/RefundDetailController.java index 7088ee5..2f3b599 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/refunddetail/RefundDetailController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/refunddetail/RefundDetailController.java @@ -54,7 +54,7 @@ public class RefundDetailController extends BaseController { */ @Before(RefundDetailPKValidator.class) public void get() { - renderJson(RefundDetailService.me.get(get("id"))); + renderJson(Result.object(RefundDetailService.me.get(get("id")))); } /** diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java index fb0a6dd..9d520de 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java @@ -121,7 +121,7 @@ public class RefundDetailController extends BaseController { */ @Before(RefundDetailPKValidator.class) public void get() { - renderJson(RefundDetailService.me.get(get("id"))); + renderJson(Result.object(RefundDetailService.me.get(get("id")))); } /**