Browse Source

Merge branch 'release_toaliyun_real_202212' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202212

release_toaliyun_real
winter 3 years ago
parent
commit
00e635a0c8
2 changed files with 5 additions and 1 deletions
  1. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V2023010200001__add账单permission.sql
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java

+ 1
- 1
mallinkAdmin/src/main/resources/db/migration/V2023010200001__add账单permission.sql View File

@@ -1,5 +1,5 @@
INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (431, '商铺管理费账单', 415, 'Y', NULL, 1, NULL, NULL, 'shopManagement', 'icon-zhangdan1', 0, 407);
INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (432, '商铺管理费账单', 415, 'Y', NULL, 1, NULL, NULL, 'pointManagement', 'icon-zhangdan1', 0, 407);
INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (432, '多经点位管理费账单', 415, 'Y', NULL, 1, NULL, NULL, 'pointManagement', 'icon-zhangdan1', 0, 407);


UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 224, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6611, 60701, 60702]' WHERE `id` = 1;


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java View File

@@ -88,6 +88,9 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="内容类型(0:小程序页面类型,1:富文本类型)",name="contentType")
private Integer contentType;

@io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark")
private String remark;

@TableField(exist = false)
private String detail;

@@ -199,6 +202,7 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
this.setValidDays(c.getValidDays());
this.setCreditPrice(c.getCreditPrice());
this.setContentType(c.getContentType());
this.setRemark(c.getRemark());
this.setSourceType(c.getSourceType());
}



Loading…
Cancel
Save