Переглянути джерело

Merge remote-tracking branch 'origin/developer' into developerB

zhengjinyi 2 роки тому
батько
коміт
aba8f57bce

+ 13 - 0
backup.sql

@@ -719,3 +719,16 @@ ALTER TABLE `cm_brand_club_feedback`
 
 
 -- =================================== 2022年6月 认证通ross版本 end =========================================
+-- =================================== 2022年7月 认证通日常sql start =========================================
+CREATE TABLE `cm_brand_product_type_param` (
+    `id` INT NOT NULL AUTO_INCREMENT,
+    `productTypeId` INT NULL COMMENT '设备分类id',
+    `name` VARCHAR(20) NULL COMMENT '参数名称',
+    `content` VARCHAR(250) NULL COMMENT '参数内容',
+    PRIMARY KEY (`id`))
+COMMENT = '认证设备分类参数';
+
+ALTER TABLE `cm_brand_product_type`
+    ADD COLUMN `brandId` INT NULL COMMENT '品牌id' AFTER `authUserId`;
+
+-- =================================== 2022年6月 认证通日常sql end =========================================

+ 2 - 2
src/main/resources/templates/pay/caimei-paylist.html

@@ -87,13 +87,13 @@
                         待付金额:<span class="red">¥{{ paidAmount | NumFormat }}</span>
                     </div>
                     <div class="content-viw">
-                        开户行:<span>中国银行深圳竹子林支行</span>
+                        开户行:<span>华夏银行深圳分行营业部</span>
                     </div>
                     <div class="content-viw">
                         户名:<span>周倩如</span>
                     </div>
                     <div class="content-viw">
-                        银行卡号:<span>6217 8520 0001 3869 139</span>
+                        银行卡号:<span>6230 2100 9221 2400</span>
                     </div>
                     <div class="content-viw">
                         订单标识:<span v-text="orderIdentificationId"></span><span class="copy" @click="copyOrderBtnSubmitFn">复制</span>

+ 2 - 2
src/main/resources/templates/pay/caimei-payunder.html

@@ -29,13 +29,13 @@
             <div class="pay-bank">
                 <div class="pay-bank-content">
                     <div class="content-viw">
-                        开户行:<span>中国银行深圳竹子林支行</span>
+                        开户行:<span>华夏银行深圳分行营业部</span>
                     </div>
                     <div class="content-viw">
                         户名:<span>周倩如</span>
                     </div>
                     <div class="content-viw">
-                        银行卡号:<span>6217 8520 0001 3869 139</span>
+                        银行卡号:<span>6230 2100 9221 2400</span>
                     </div>
                     <div class="content-viw">
                         订单标识:<span v-text="orderIdentificationId"></span><span class="copy" @click="copyOrderBtnSubmitFn">复制</span>