From 09a1a2386e55e4b40027c4dd8a31ea26226b80fc Mon Sep 17 00:00:00 2001 From: taozi <9108791@qq.com> Date: Fri, 5 Feb 2021 10:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/.yshop.version/yshop-V1.1.pdman.json | 6 +++--- sql/.yshop.version/yshop-V1.2.pdman.json | 6 +++--- sql/.yshop.version/yshop-base.pdman.json | 6 +++--- sql/yshop.pdman.json | 4 ++-- sql/yshop3.2.sql | 4 ++-- .../co/yixiang/modules/activity/domain/YxStorePink.java | 4 ++-- .../modules/activity/service/dto/YxStoreCombinationDto.java | 2 +- .../modules/activity/service/dto/YxStorePinkDto.java | 2 +- .../service/impl/YxStoreCombinationServiceImpl.java | 2 +- .../activity/service/impl/YxStorePinkServiceImpl.java | 2 +- .../co/yixiang/modules/activity/vo/YxStorePinkQueryVo.java | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sql/.yshop.version/yshop-V1.1.pdman.json b/sql/.yshop.version/yshop-V1.1.pdman.json index f649bb79..e2e22d3e 100644 --- a/sql/.yshop.version/yshop-V1.1.pdman.json +++ b/sql/.yshop.version/yshop-V1.1.pdman.json @@ -3638,7 +3638,7 @@ { "name": "people", "type": "INT UNSIGNED_10", - "chnname": "拼图总人数", + "chnname": "拼团总人数", "remark": "", "pk": false, "notNull": true, @@ -4478,7 +4478,7 @@ { "name": "cost", "type": "INT UNSIGNED_10", - "chnname": "拼图产品成本", + "chnname": "拼团产品成本", "remark": "", "pk": false, "notNull": true, @@ -11447,4 +11447,4 @@ } ], "date": "2020/9/5 17:13:6" -} \ No newline at end of file +} diff --git a/sql/.yshop.version/yshop-V1.2.pdman.json b/sql/.yshop.version/yshop-V1.2.pdman.json index 576e5e44..a4aa6629 100644 --- a/sql/.yshop.version/yshop-V1.2.pdman.json +++ b/sql/.yshop.version/yshop-V1.2.pdman.json @@ -3346,7 +3346,7 @@ { "name": "people", "type": "INT UNSIGNED_10", - "chnname": "拼图总人数", + "chnname": "拼团总人数", "remark": "", "pk": false, "notNull": true, @@ -4186,7 +4186,7 @@ { "name": "cost", "type": "INT UNSIGNED_10", - "chnname": "拼图产品成本", + "chnname": "拼团产品成本", "remark": "", "pk": false, "notNull": true, @@ -11399,4 +11399,4 @@ } ], "date": "2020/9/12 23:56:59" -} \ No newline at end of file +} diff --git a/sql/.yshop.version/yshop-base.pdman.json b/sql/.yshop.version/yshop-base.pdman.json index 1af9deef..ff6ce229 100644 --- a/sql/.yshop.version/yshop-base.pdman.json +++ b/sql/.yshop.version/yshop-base.pdman.json @@ -3561,7 +3561,7 @@ { "name": "people", "type": "INT UNSIGNED_10", - "chnname": "拼图总人数", + "chnname": "拼团总人数", "remark": "", "pk": false, "notNull": true, @@ -4421,7 +4421,7 @@ { "name": "cost", "type": "INT UNSIGNED_10", - "chnname": "拼图产品成本", + "chnname": "拼团产品成本", "remark": "", "pk": false, "notNull": true, @@ -11244,4 +11244,4 @@ "version": "V1.0", "message": "V1", "date": "2020/7/21 12:14:27" -} \ No newline at end of file +} diff --git a/sql/yshop.pdman.json b/sql/yshop.pdman.json index e15d5950..5da5ed4c 100644 --- a/sql/yshop.pdman.json +++ b/sql/yshop.pdman.json @@ -3346,7 +3346,7 @@ { "name": "people", "type": "INT UNSIGNED_10", - "chnname": "拼图总人数", + "chnname": "拼团总人数", "remark": "", "pk": false, "notNull": true, @@ -4186,7 +4186,7 @@ { "name": "cost", "type": "INT UNSIGNED_10", - "chnname": "拼图产品成本", + "chnname": "拼团产品成本", "remark": "", "pk": false, "notNull": true, diff --git a/sql/yshop3.2.sql b/sql/yshop3.2.sql index cd49c63e..cbd4dbdc 100644 --- a/sql/yshop3.2.sql +++ b/sql/yshop3.2.sql @@ -2004,7 +2004,7 @@ CREATE TABLE `yx_store_combination` ( `start_time` datetime(0) NOT NULL COMMENT '拼团开始时间', `stop_time` datetime(0) NOT NULL COMMENT '拼团结束时间', `effective_time` int(11) NOT NULL DEFAULT 0 COMMENT '拼团订单有效时间', - `cost` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '拼图产品成本', + `cost` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '拼团产品成本', `browse` int(11) NULL DEFAULT 0 COMMENT '浏览量', `unit_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '单位名', `spec_type` tinyint(1) NULL DEFAULT NULL COMMENT '规格 0单 1多', @@ -2282,7 +2282,7 @@ CREATE TABLE `yx_store_pink` ( `total_price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '购买总金额', `cid` bigint(20) UNSIGNED NOT NULL COMMENT '拼团产品id', `pid` bigint(20) UNSIGNED NOT NULL COMMENT '产品id', - `people` int(10) UNSIGNED NOT NULL COMMENT '拼图总人数', + `people` int(10) UNSIGNED NOT NULL COMMENT '拼团总人数', `price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '拼团产品单价', `create_time` datetime(0) NOT NULL COMMENT '开始时间', `update_time` datetime(0) NULL DEFAULT NULL, diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java index 95cbb257..0b903be1 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java @@ -72,8 +72,8 @@ public class YxStorePink extends BaseDomain { private Long pid; - /** 拼图总人数 */ - @ApiModelProperty(value = "拼图总人数") + /** 拼团总人数 */ + @ApiModelProperty(value = "拼团总人数") private Integer people; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java index cb0e647c..c03f0718 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java @@ -109,7 +109,7 @@ public class YxStoreCombinationDto implements Serializable { // 拼团订单有效时间 private Integer effectiveTime; - // 拼图产品成本 + // 拼团产品成本 private Integer cost; // 浏览量 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java index 27bc1935..355b3e83 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java @@ -42,7 +42,7 @@ public class YxStorePinkDto implements Serializable { /** 产品id */ private Long pid; - /** 拼图总人数 */ + /** 拼团总人数 */ private Integer people; /** 拼团产品单价 */ diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java index db166b2d..8b97f194 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java @@ -260,7 +260,7 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl