diff --git a/rc-busness/nuxt.config.js b/rc-busness/nuxt.config.js index baaca67b..cf6a46a5 100644 --- a/rc-busness/nuxt.config.js +++ b/rc-busness/nuxt.config.js @@ -2,8 +2,8 @@ const trackingScript = 'var dataLayer = window.dataLayer = window.dataLayer || [ const assetsUrl = 'var assetsUrl="/royalcanin-cdn-assets-new/css_js/";var isInitialized=false;'; export default { env: { - //NODE_ENV: 'development' - NODE_ENV: 'production' + NODE_ENV: 'development' + //NODE_ENV: 'production' }, // Global page headers: https://go.nuxtjs.dev/config-head head: { @@ -15,8 +15,8 @@ export default { script: [ //{ src: '/js/rem.js' }, // { src: '/js/flexible.js', type: 'text/javascript', charset: 'utf-8'}, - //{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' }, - { src: 'https://ocs.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' }, + { src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' }, + //{ src: 'https://ocs.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' }, //{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' }, { innerHTML: trackingScript, type: 'text/javascript', charset: 'utf-8'}, { innerHTML: assetsUrl, type: 'text/javascript', charset: 'utf-8'}, diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigFindAllEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigFindAllEntity.java index e9fb689a..78e5a64b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigFindAllEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigFindAllEntity.java @@ -13,14 +13,14 @@ public class CouponConfigFindAllEntity { /** * 渠道 */ - @ApiModelProperty(example = "2") - private int channelId; + @ApiModelProperty(example = "15") + private int channelId = 15; /** * 渠道秘钥 */ @ApiModelProperty(example = "H5@2021") - private String channelSecurity; + private String channelSecurity = "H5@2021"; /** * 会员标签Id