From 8ba52a1513f8b21fc23fde5727e12cbc712c33be Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Thu, 24 Dec 2020 16:17:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E6=88=B7=E8=B5=84=E6=96=99=20?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=A4=9A=E7=A7=8D=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/db/modify.sql | 5 + .../merchants/beans/ClientRegisterInfo.java | 6 +- .../ui/static/commons/services/industryMap.js | 120 +++++++++++ .../ui/static/payment/partner/add-partner.js | 91 +++++++- .../static/payment/partner/partner-manage.js | 204 +++++++++++++++++- .../partner/templates/add_partner.html | 31 +-- .../templates/add_sub_partner_dialog.html | 29 +-- .../new_apply_wx_sub_merchant_id.html | 21 +- .../partner/templates/partner_edit.html | 32 +-- .../templates/sub_merchant_id_apply.html | 3 +- 10 files changed, 475 insertions(+), 67 deletions(-) diff --git a/src/db/modify.sql b/src/db/modify.sql index 2053b4215..52d9dbccf 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -771,3 +771,8 @@ alter table sys_wx_merchant_apply ALTER TABLE `sys_clients` ADD COLUMN certificat_expire_date date DEFAULT NULL COMMENT '注册证书过期时间'; + + +-- 商户表 日期类型改为varchar 2020.12.23 +ALTER TABLE `sys_clients` + modify COLUMN certificat_expire_date varchar(20) DEFAULT NULL COMMENT '注册证书过期时间'; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java index e5cea877e..a2db2971f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java @@ -134,7 +134,7 @@ public class ClientRegisterInfo { private String director_id_number; private String principal_name; private String principal_id_number; - private Date certificat_expire_date;//注册证书过期时间 + private String certificat_expire_date;//注册证书过期时间 private String mc_code;//微信mccode @@ -675,11 +675,11 @@ public class ClientRegisterInfo { this.principal_id_number = principal_id_number; } - public Date getCertificat_expire_date() { + public String getCertificat_expire_date() { return certificat_expire_date; } - public void setCertificat_expire_date(Date certificat_expire_date) { + public void setCertificat_expire_date(String certificat_expire_date) { this.certificat_expire_date = certificat_expire_date; } diff --git a/src/main/ui/static/commons/services/industryMap.js b/src/main/ui/static/commons/services/industryMap.js index 75aad7d3c..56c927b9c 100644 --- a/src/main/ui/static/commons/services/industryMap.js +++ b/src/main/ui/static/commons/services/industryMap.js @@ -158,6 +158,126 @@ define(['../app'], function (app) { { "label": "Medical Service", "value": "533" + }, + { + "label": "Online games (Top-up)", + "value": "644" + }, + { + "label": "Online Shopping Mall", + "value": "648" + }, + { + "label": "Supermarket", + "value": "649" + }, + { + "label": "Convenience Store", + "value": "651" + }, + { + "label": "Duty-free Shop", + "value": "652" + }, + { + "label": "Pharmacy", + "value": "653" + }, + { + "label": "Vending Machine", + "value": "654" + }, + { + "label": "Department Store /Shopping Centre", + "value": "655" + }, + { + "label": "Food/Beverages", + "value": "656" + }, + { + "label": "Catering Services", + "value": "657" + }, + { + "label": "Furniture/Household Products", + "value": "658" + }, + { + "label": "Home Appliances/Camera Equipment/Office Equipment", + "value": "659" + }, + { + "label": "Beauty/Personal Care Products", + "value": "660" + }, + { + "label": "Flowers/Plants/Interior Decorations/Decorations", + "value": "661" + }, + { + "label": "Nursery Products/Toys", + "value": "662" + }, + { + "label": "Clothing/Shoes/Other Accessories", + "value": "663" + }, + { + "label": "Sports/Fitness Equipment/Security", + "value": "664" + }, + { + "label": "Watches/Eyewear/Jewellery", + "value": "665" + }, + { + "label": "Outdoor Products /Travel Products", + "value": "666" + }, + { + "label": "Books / Records / Stationery / Musical Instruments", + "value": "667" + }, + { + "label": "Flight ticket/ticketing agent", + "value": "668" + }, + { + "label": "Sightseeing Passes", + "value": "669" + }, + { + "label": "Hotel/Resort", + "value": "670" + }, + { + "label": "Online Books/Video/Music", + "value": "671" + }, + { + "label": "Online games (Download)", + "value": "672" + }, + { + "label": "University Education", + "value": "677" + }, + { + "label": "Public hospitals/Medical Institutions", + "value": "679" + }, + { + "label": "Private hospitals/Clinics/Medical institutions", + "value": "678" + }, + { + "label": "Public transit", + "value": "680" + }, + { + "label": "Logistics/ Courier Service", + "value": "684" } ]; app.factory('industryMap', function () { diff --git a/src/main/ui/static/payment/partner/add-partner.js b/src/main/ui/static/payment/partner/add-partner.js index b8ead9fef..3b28d185f 100644 --- a/src/main/ui/static/payment/partner/add-partner.js +++ b/src/main/ui/static/payment/partner/add-partner.js @@ -32,7 +32,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } }) }]); - app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'businessStructuresMap', 'upayIndustryMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap','wechatGoodMcc', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, upayIndustryMap, industryMap, stateMap, sectorMap, countryMap,wechatGoodMcc) { + app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'businessStructuresMap', 'upayIndustryMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap','wechatGoodMcc','$filter', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, upayIndustryMap, industryMap, stateMap, sectorMap, countryMap,wechatGoodMcc,$filter) { if ($scope.partner_application) { $scope.partner = angular.copy($scope.partner_application); delete $rootScope.partner_application; @@ -57,7 +57,25 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.partner.contact_phone_c = 61; $scope.partner.client_pay_type = []; $scope.partner.client_pay_desc = []; - + $scope.checkExpriedate=function (value) { + if(value){ + $scope.partner.certificat_expire_date_premanent=false; + $scope.partner.certificat_expire_date_NA=false; + } + } + $scope.checkExpriedateOther=function (value) { + if(value=='PERMANENT'){ + if($scope.partner.certificat_expire_date_premanent){ + $scope.partner.certificat_expire_date_NA=false; + $scope.partner.certificat_expire_date_d=null; + } + }else if(value=='N/A'){ + if($scope.partner.certificat_expire_date_NA){ + $scope.partner.certificat_expire_date_premanent=false; + $scope.partner.certificat_expire_date_d=null; + } + } + } var resetClientPayDescByTpey = function (type) { type = parseInt(type); if (type == 1) { @@ -232,6 +250,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter alert('Please select the business structure'); return; } + if ($scope.partner.business_structure!='Registered body(Sole Trader)') { + if ($scope.partner.certificat_expire_date_d) { + $scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d) + } else if ($scope.partner.certificat_expire_date_premanent) { + $scope.partner.certificat_expire_date = "PERMANENT"; + } + else if ($scope.partner.certificat_expire_date_NA) { + $scope.partner.certificat_expire_date = "N/A"; + } else { + alert("Certificate expiration time is required"); + return; + } + } if (!$scope.partner.enable_cross_payment && !$scope.partner.enable_card_payment) { alert("商户至少开通一种支付方式,请检查是否选择了跨境支付或卡支付!"); return; @@ -441,16 +472,45 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } } }]); - app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','wechatGoodMcc', - function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,wechatGoodMcc) { + app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','wechatGoodMcc','$filter', + function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,wechatGoodMcc,$filter) { $scope.upayIndustrys = upayIndustryMap.configs(); $scope.timezones = timezone.configs(); $scope.wechatMccIndustries = wechatGoodMcc.configs(); $scope.partner = partner.data; + // if(partner.data.certificat_expire_date) { + // var datestr = partner.data.certificat_expire_date.replace(/-/g, '/'); + // $scope.partner.certificat_expire_date=new Date(datestr); + // } if(partner.data.certificat_expire_date) { - var datestr = partner.data.certificat_expire_date.replace(/-/g, '/'); - $scope.partner.certificat_expire_date=new Date(datestr); + if( $scope.partner.certificat_expire_date=="PERMANENT"){ + $scope.partner.certificat_expire_date_premanent=true; + }else if( $scope.partner.certificat_expire_date=="N/A"){ + $scope.partner.certificat_expire_date_NA=true; + }else { + var datestr = $scope.partner.certificat_expire_date.replace(/-/g, '/'); + $scope.partner.certificat_expire_date_d = new Date(datestr); + } + } + $scope.checkExpriedate=function (value) { + if(value){ + $scope.partner.certificat_expire_date_premanent=false; + $scope.partner.certificat_expire_date_NA=false; + } + } + $scope.checkExpriedateOther=function (value) { + if(value=='PERMANENT'){ + if($scope.partner.certificat_expire_date_premanent){ + $scope.partner.certificat_expire_date_NA=false; + $scope.partner.certificat_expire_date_d=null; + } + }else if(value=='N/A'){ + if($scope.partner.certificat_expire_date_NA){ + $scope.partner.certificat_expire_date_premanent=false; + $scope.partner.certificat_expire_date_d=null; + } + } } if($scope.partner.mc_code ){ $scope.partner.mc_code=parseInt($scope.partner.mc_code); @@ -664,7 +724,23 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }); return; } - + if (!$scope.partner.business_structure||$scope.partner.business_structure == '') { + alert('Please select the business structure'); + return; + } + if ($scope.partner.business_structure!='Registered body(Sole Trader)') { + if ($scope.partner.certificat_expire_date_d) { + $scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d) + } else if ($scope.partner.certificat_expire_date_premanent) { + $scope.partner.certificat_expire_date = "PERMANENT"; + } + else if ($scope.partner.certificat_expire_date_NA) { + $scope.partner.certificat_expire_date = "N/A"; + } else { + alert("Certificate expiration time is required"); + return; + } + } if ($scope.partner.company_name.indexOf("Migration") != -1) { alert("Company Name包含敏感词汇,请检查后重新提交!"); return; @@ -705,6 +781,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } }) } + var content = ''; if (!origin_referrer_id && $scope.partner.referrer_id) { content = 'Update partner info successfully,But You Had add new Referrer,Please Change the BD Commission Proportion!'; diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 47a6c12e8..5106cadeb 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -152,6 +152,126 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter { "label": "Medical Service", "value": "533" + }, + { + "label": "Online games (Top-up)", + "value": "644" + }, + { + "label": "Online Shopping Mall", + "value": "648" + }, + { + "label": "Supermarket", + "value": "649" + }, + { + "label": "Convenience Store", + "value": "651" + }, + { + "label": "Duty-free Shop", + "value": "652" + }, + { + "label": "Pharmacy", + "value": "653" + }, + { + "label": "Vending Machine", + "value": "654" + }, + { + "label": "Department Store /Shopping Centre", + "value": "655" + }, + { + "label": "Food/Beverages", + "value": "656" + }, + { + "label": "Catering Services", + "value": "657" + }, + { + "label": "Furniture/Household Products", + "value": "658" + }, + { + "label": "Home Appliances/Camera Equipment/Office Equipment", + "value": "659" + }, + { + "label": "Beauty/Personal Care Products", + "value": "660" + }, + { + "label": "Flowers/Plants/Interior Decorations/Decorations", + "value": "661" + }, + { + "label": "Nursery Products/Toys", + "value": "662" + }, + { + "label": "Clothing/Shoes/Other Accessories", + "value": "663" + }, + { + "label": "Sports/Fitness Equipment/Security", + "value": "664" + }, + { + "label": "Watches/Eyewear/Jewellery", + "value": "665" + }, + { + "label": "Outdoor Products /Travel Products", + "value": "666" + }, + { + "label": "Books / Records / Stationery / Musical Instruments", + "value": "667" + }, + { + "label": "Flight ticket/ticketing agent", + "value": "668" + }, + { + "label": "Sightseeing Passes", + "value": "669" + }, + { + "label": "Hotel/Resort", + "value": "670" + }, + { + "label": "Online Books/Video/Music", + "value": "671" + }, + { + "label": "Online games (Download)", + "value": "672" + }, + { + "label": "University Education", + "value": "677" + }, + { + "label": "Public hospitals/Medical Institutions", + "value": "679" + }, + { + "label": "Private hospitals/Clinics/Medical institutions", + "value": "678" + }, + { + "label": "Public transit", + "value": "680" + }, + { + "label": "Logistics/ Courier Service", + "value": "684" } ]; var removeClientPayDesc = function (items, key) { @@ -3138,8 +3258,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } }]); app.controller('partnerNewSubPartnerDialogCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', - 'clientMoniker', 'industryMap', 'businessStructuresMap', 'stateMap', 'countryMap','wechatGoodMcc', - function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, clientMoniker, industryMap, businessStructuresMap, stateMap, countryMap,wechatGoodMcc) { + 'clientMoniker', 'industryMap', 'businessStructuresMap', 'stateMap', 'countryMap','wechatGoodMcc','$filter', + function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, clientMoniker, industryMap, businessStructuresMap, stateMap, countryMap,wechatGoodMcc,$filter) { if ($scope.partner_application) { $scope.partner = angular.copy($scope.partner_application); delete $rootScope.partner_application; @@ -3161,7 +3281,25 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.merchantIsValid = false; $scope.merchantCodeChecked = false; $scope.wechatMccIndustries = wechatGoodMcc.configs(); - + $scope.checkExpriedate=function (value) { + if(value){ + $scope.partner.certificat_expire_date_premanent=false; + $scope.partner.certificat_expire_date_NA=false; + } + } + $scope.checkExpriedateOther=function (value) { + if(value=='PERMANENT'){ + if($scope.partner.certificat_expire_date_premanent){ + $scope.partner.certificat_expire_date_NA=false; + $scope.partner.certificat_expire_date_d=null; + } + }else if(value=='N/A'){ + if($scope.partner.certificat_expire_date_NA){ + $scope.partner.certificat_expire_date_premanent=false; + $scope.partner.certificat_expire_date_d=null; + } + } + } var resetClientPayDescByTpey = function (type) { type = parseInt(type); if (type == 1) { @@ -3352,6 +3490,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter alert('Please select the business structure'); return; } + if ($scope.partner.business_structure!='Registered body(Sole Trader)') { + if ($scope.partner.certificat_expire_date_d) { + $scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d) + } else if ($scope.partner.certificat_expire_date_premanent) { + $scope.partner.certificat_expire_date = "PERMANENT"; + } + else if ($scope.partner.certificat_expire_date_NA) { + $scope.partner.certificat_expire_date = "N/A"; + } else { + alert("Certificate expiration time is required"); + return; + } + } if ($scope.partner.company_name.indexOf("Migration") != -1) { alert("Company Name包含敏感词汇,请检查后重新提交!"); return; @@ -5544,7 +5695,37 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.subMerchantInfo.certificat_expire_date=new Date(datestr); } if($scope.subMerchantInfo.business_structure ){ - $scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure == 'Company'? "ENTERPRISE":"INDIVIDUAL"; + $scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)'? "ENTERPRISE":"INDIVIDUAL"; + } + if(subMerchantInfo.certificat_expire_date) { + if(subMerchantInfo.certificat_expire_date=="PERMANENT"){ + $scope.subMerchantInfo.certificat_expire_date_premanent=true; + }else if(subMerchantInfo.certificat_expire_date=="N/A"){ + $scope.subMerchantInfo.certificat_expire_date_NA=true; + }else { + var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/'); + $scope.subMerchantInfo.certificat_expire_date_d = new Date(datestr); + } + } + + $scope.checkExpriedate=function (value) { + if(value){ + $scope.subMerchantInfo.certificat_expire_date_premanent=false; + $scope.subMerchantInfo.certificat_expire_date_NA=false; + } + } + $scope.checkExpriedateOther=function (value) { + if(value=='PERMANENT'){ + if($scope.subMerchantInfo.certificat_expire_date_premanent){ + $scope.subMerchantInfo.certificat_expire_date_NA=false; + $scope.subMerchantInfo.certificat_expire_date_d=null; + } + }else if(value=='N/A'){ + if($scope.subMerchantInfo.certificat_expire_date_NA){ + $scope.subMerchantInfo.certificat_expire_date_premanent=false; + $scope.subMerchantInfo.certificat_expire_date_d=null; + } + } } $scope.saveAppliy = function (form) { $scope.errmsg = null; @@ -5585,8 +5766,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter params.director_id_number = $scope.subMerchantInfo.director_id_number; params.company_register_no = $scope.subMerchantInfo.company_register_no; params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date; - if($scope.subMerchantInfo.certificat_expire_date) { - params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date) + + if($scope.subMerchantInfo.certificat_expire_date_d) { + params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date_d) + }else if($scope.subMerchantInfo.certificat_expire_date_premanent){ + params.certificat_expire_date="PERMANENT"; + } + else if($scope.subMerchantInfo.certificat_expire_date_NA){ + params.certificat_expire_date="N/A"; + }else{ + alert("Certificate expiration time is required"); + return; } }else{ params.principal_name = $scope.subMerchantInfo.principal_name; @@ -5635,7 +5825,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.businessTypesMap=businessTypesMap.configs(); if($scope.subMerchantInfo.business_structure ){ - $scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure == 'Company'? "ENTERPRISE":"INDIVIDUAL"; + $scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)'? "ENTERPRISE":"INDIVIDUAL"; } if($scope.subMerchantInfo.industry) { $scope.subMerchantInfo.industry = $filter('newWxMerchantsFilter')($scope.subMerchantInfo.industry); diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index 1e4a08256..95308a108 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -309,25 +309,28 @@ -
-
- -
-
-

Required Field

-
+   + + +

PERMANENT

+
+ +

N/A

+ +
-
-
- -
-
-

Required Field

-
+   + +

PERMANENT

+
+ +

N/A

+
diff --git a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html index 9b8971dbe..71120fbf9 100644 --- a/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html +++ b/src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html @@ -228,18 +228,25 @@ ng-class="{'has-error':subForm.certificat_expire_date.$invalid && subForm.certificat_expire_date.$dirty}">
- -
-

Required Field

-

Length is more than 50

-
+   + + +

PERMANENT

+ +
+ + +

N/A

+ +
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html index 562860fa3..6804d3cf0 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -330,25 +330,29 @@ -
-
- -
-
-

Required Field

-
+   + + +

PERMANENT

+ +
+ + +

N/A

+
diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html index 54ac0ab8c..b616b0c7b 100644 --- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html +++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html @@ -67,7 +67,8 @@
  • Mcc Code - {{id_apply.mcc_code | wechatMcc }} + {{id_apply.mcc_code | wechatMcc }} +
  • Operator From fbeda072f817039ddbc20e1de620fce3c7337bb5 Mon Sep 17 00:00:00 2001 From: AlanFenng Date: Thu, 24 Dec 2020 17:58:37 +0800 Subject: [PATCH 2/2] release 2.3.74 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc021aba4..97425ae42 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.74-SNAPSHOT + 2.3.74 UTF-8 2.4.0