更新

yiqi-common/src/main/java/com/yiqi/activity/domain/vo/ActivityAppCouponItemVO.java

@@ -20,7 +20,6 @@ public class ActivityAppCouponItemVO extends BaseEntity
 
     /** 主键ID */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 订单编码 */

yiqi-common/src/main/java/com/yiqi/activity/domain/vo/ActivityClothItemMinPriceVO.java

@@ -18,18 +18,15 @@ public class ActivityClothItemMinPriceVO extends BaseEntity
 
     /** 主键ID */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 活动ID */
     @ApiModelProperty("活动ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long activityId;
 
     /** 衣服ID */
     @Excel(name = "衣服ID")
     @ApiModelProperty("衣服ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long clothItemId;
 
     /** 指定价格 */
@@ -40,7 +37,6 @@ public class ActivityClothItemMinPriceVO extends BaseEntity
     /** 洗衣类型ID */
     @Excel(name = "洗衣类型ID")
     @ApiModelProperty("洗衣类型ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long washModeId;
 
     /** 删除状态（0=正常,2=删除） */

yiqi-common/src/main/java/com/yiqi/activity/domain/vo/ActivityClothItemVO.java

@@ -23,12 +23,10 @@ public class ActivityClothItemVO extends BaseEntity
     private static final long serialVersionUID=1L;
 
     @ApiModelProperty("ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 主键ID */
     @ApiModelProperty("衣服ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long clothId;
 
     /** 衣服ID */

yiqi-common/src/main/java/com/yiqi/activity/domain/vo/ActivityCouponItemVO.java

@@ -18,7 +18,6 @@ import java.util.Date;
 public class ActivityCouponItemVO {
 
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 活动ID */

yiqi-common/src/main/java/com/yiqi/app/domain/AppCouponItem.java

@@ -33,7 +33,6 @@ public class AppCouponItem extends BaseEntity {
      */
     @TableId(type = IdType.AUTO)
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     @ApiModelProperty("优惠方式（0=抵扣,1=满减,2=折扣）")
@@ -44,7 +43,6 @@ public class AppCouponItem extends BaseEntity {
      */
     @Excel(name = "优惠券类型ID")
     @ApiModelProperty("优惠券类型ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long couponTypeId;
 
     @ApiModelProperty("优惠券类型名称")
@@ -69,7 +67,6 @@ public class AppCouponItem extends BaseEntity {
      */
     @Excel(name = "活动ID")
     @ApiModelProperty("活动ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long activityInfoId;
 
     /**
@@ -77,7 +74,6 @@ public class AppCouponItem extends BaseEntity {
      */
     @Excel(name = "所属门店")
     @ApiModelProperty("所属门店")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long storeId;
 
     /**
@@ -90,7 +86,6 @@ public class AppCouponItem extends BaseEntity {
      */
     @Excel(name = "客户ID")
     @ApiModelProperty("客户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
 
@@ -153,7 +148,6 @@ public class AppCouponItem extends BaseEntity {
      * 核销组织ID
      */
     @ApiModelProperty("核销门店")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long usedStoreId;
 
     /**
@@ -161,7 +155,6 @@ public class AppCouponItem extends BaseEntity {
      */
     @Excel(name = "核销门店")
     @ApiModelProperty("核销门店")
-    @JsonSerialize(using = ToStringSerializer.class)
     @TableField(exist = false)
     private String usedStoreName;
 

yiqi-common/src/main/java/com/yiqi/app/domain/AppOrgUser.java

@@ -28,7 +28,6 @@ public class AppOrgUser extends BaseEntity {
      */
     @ApiModelProperty("ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -36,7 +35,6 @@ public class AppOrgUser extends BaseEntity {
      */
     @Excel(name = "用户ID")
     @ApiModelProperty("用户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
     /**
@@ -44,8 +42,6 @@ public class AppOrgUser extends BaseEntity {
      */
     @Excel(name = "组织ID")
     @ApiModelProperty("组织ID")
-
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /**

yiqi-common/src/main/java/com/yiqi/app/domain/AppUser.java

@@ -31,7 +31,6 @@ public class AppUser extends BaseEntity
     /** ID */
     @TableId(type = IdType.AUTO)
     @ApiModelProperty("ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 手机号 */

yiqi-common/src/main/java/com/yiqi/app/domain/AppUserBillDetail.java

@@ -28,25 +28,21 @@ public class AppUserBillDetail extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 账单主表ID */
     @Excel(name = "账单主表ID")
     @ApiModelProperty("账单主表ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long billMstrId;
 
     /** 用户ID */
     @Excel(name = "用户ID")
     @ApiModelProperty("用户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
     /** 组织ID */
     @Excel(name = "组织ID")
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /** 来源类型 */
@@ -87,7 +83,6 @@ public class AppUserBillDetail extends BaseEntity
     /** 充值卡ID */
     @Excel(name = "充值卡ID")
     @ApiModelProperty("充值卡ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long rechargeCardId;
 
     /** 是否退款 */

yiqi-common/src/main/java/com/yiqi/app/domain/AppVersion.java

@@ -1,5 +1,7 @@
 package com.yiqi.app.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -24,7 +26,7 @@ public class AppVersion extends BaseEntity
 
     /** ID */
     @ApiModelProperty("ID")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 平台（Android，IOS） */

yiqi-common/src/main/java/com/yiqi/app/domain/vo/AppUserBillMstrQueryByCountUseVO.java

@@ -19,11 +19,9 @@ public class AppUserBillMstrQueryByCountUseVO extends BaseEntity {
 
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     @ApiModelProperty("充值卡ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long rechargeCardId;
 
     /**
@@ -41,7 +39,6 @@ public class AppUserBillMstrQueryByCountUseVO extends BaseEntity {
     private String content;
 
     @ApiModelProperty("订单ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     /**
@@ -62,11 +59,9 @@ public class AppUserBillMstrQueryByCountUseVO extends BaseEntity {
     private String payType;
 
     @ApiModelProperty("客户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     @ApiModelProperty("来源类型")

yiqi-common/src/main/java/com/yiqi/app/domain/vo/AppUserLoginVO.java

@@ -17,7 +17,6 @@ import java.util.Date;
 public class AppUserLoginVO {
     /** ID */
     @ApiModelProperty("ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 手机号 */

yiqi-common/src/main/java/com/yiqi/app/domain/vo/weapp/WeAppGoodsMarketVO.java

@@ -30,7 +30,6 @@ public class WeAppGoodsMarketVO
 
     /** 主键ID */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 是否选中（N=未选中，Y=选中） */
@@ -41,7 +40,6 @@ public class WeAppGoodsMarketVO
     /** 用户ID */
     @Excel(name = "用户ID")
     @ApiModelProperty("用户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
     /** 购买数量 */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothBrand.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -25,7 +27,7 @@ public class ClothBrand extends BaseEntity {
      * 主键ID
      */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/ClothColor.java

@@ -25,7 +25,6 @@ public class ClothColor extends BaseEntity {
 
     /** 衣服颜色id */
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 衣服颜色名称 */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothFlawType.java

@@ -25,7 +25,6 @@ public class ClothFlawType extends BaseEntity {
 
     /** 衣服瑕疵类型id */
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 衣服瑕疵类型名称 */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothHangerDetail.java

@@ -28,21 +28,18 @@ public class ClothHangerDetail extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 挂架ID
      */
     @ApiModelProperty("挂架ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long hangerId;
 
     /**
      * 组织ID
      */
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/ClothHangerOrderRelation.java

@@ -28,7 +28,6 @@ public class ClothHangerOrderRelation extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -36,7 +35,6 @@ public class ClothHangerOrderRelation extends BaseEntity {
      */
     @Excel(name = "订单ID")
     @ApiModelProperty("订单ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     /**
@@ -44,7 +42,6 @@ public class ClothHangerOrderRelation extends BaseEntity {
      */
     @Excel(name = "洗衣订单衣服明细id")
     @ApiModelProperty("洗衣订单衣服明细id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderClothItemId;
 
     /**
@@ -59,7 +56,6 @@ public class ClothHangerOrderRelation extends BaseEntity {
      */
     @Excel(name = "挂架ID")
     @ApiModelProperty("挂架ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long clothHangerId;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/ClothPrice.java

@@ -28,15 +28,12 @@ public class ClothPrice extends BaseEntity
     private static final long serialVersionUID=1L;
 
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     @ApiModelProperty("衣服ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long clothId;
 
     @ApiModelProperty("业务区域编号")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long storeAreaId;
 
     /** 价格 */
@@ -47,7 +44,6 @@ public class ClothPrice extends BaseEntity
     /** 洗衣方式 */
     @Excel(name = "洗衣方式")
     @ApiModelProperty("洗衣方式")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long washModeId;
 
     /** 衣服类型 */

yiqi-common/src/main/java/com/yiqi/core/domain/ClothTexture.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -24,7 +26,7 @@ public class ClothTexture extends BaseEntity
 
     /** ID */
     @ApiModelProperty("ID")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 编号 */

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsBrand.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -27,7 +29,7 @@ public class GoodsBrand extends BaseEntity {
      */
     @Excel(name = "品牌编号")
     @ApiModelProperty("品牌编号")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsCommentRelation.java

@@ -30,7 +30,6 @@ public class GoodsCommentRelation {
      */
     @ApiModelProperty("编号")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -38,7 +37,6 @@ public class GoodsCommentRelation {
      */
     @Excel(name = "评论id")
     @ApiModelProperty("评论id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long goodsCommentId;
 
     /**
@@ -46,11 +44,9 @@ public class GoodsCommentRelation {
      */
     @Excel(name = "物料明细id")
     @ApiModelProperty("物料明细id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long goodsSkuId;
 
     @ApiModelProperty("商品id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long goodsId;
 
     @ApiModelProperty("商品名称")

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsCommentReply.java

@@ -39,7 +39,6 @@ public class GoodsCommentReply extends BaseEntity
     /** 用户id */
     @Excel(name = "用户id")
     @ApiModelProperty("用户id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
     /** 是否显示 */

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsSkuSpec.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -25,7 +27,7 @@ public class GoodsSkuSpec extends BaseEntity {
      * 主键id
      */
     @ApiModelProperty("主键id")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
@@ -33,7 +35,6 @@ public class GoodsSkuSpec extends BaseEntity {
      */
     @Excel(name = "物料明细id")
     @ApiModelProperty("物料明细id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long goodsSkuId;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsSkuStore.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -27,7 +29,7 @@ public class GoodsSkuStore extends BaseEntity {
      * 编号
      */
     @ApiModelProperty("编号")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
@@ -35,7 +37,6 @@ public class GoodsSkuStore extends BaseEntity {
      */
     @Excel(name = "商品SKU ID")
     @ApiModelProperty("商品SKU ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long goodsSkuId;
 
     /**
@@ -50,7 +51,6 @@ public class GoodsSkuStore extends BaseEntity {
      */
     @Excel(name = "门店编号")
     @ApiModelProperty("门店编号")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long targetId;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/GoodsStore.java

@@ -1,5 +1,7 @@
 package com.yiqi.core.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -25,7 +27,7 @@ public class GoodsStore extends BaseEntity {
      * 编号
      */
     @ApiModelProperty("编号")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
@@ -40,7 +42,6 @@ public class GoodsStore extends BaseEntity {
      */
     @Excel(name = "门店编号")
     @ApiModelProperty("门店编号")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long targetId;
 
     /**
@@ -48,7 +49,6 @@ public class GoodsStore extends BaseEntity {
      */
     @Excel(name = "商品编号")
     @ApiModelProperty("商品编号")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long goodsId;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/SettlementBalanceRecord.java

@@ -31,7 +31,6 @@ public class SettlementBalanceRecord extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 来源类型 */
@@ -42,13 +41,11 @@ public class SettlementBalanceRecord extends BaseEntity
     /** 组织ID */
     @Excel(name = "组织ID")
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /** 主账单ID */
     @Excel(name = "主账单ID")
     @ApiModelProperty("主账单ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long mstrBillId;
 
     /** 账单标题 */

yiqi-common/src/main/java/com/yiqi/core/domain/dto/ClothPriceAddByWashModeDTO.java

@@ -15,7 +15,6 @@ import java.math.BigDecimal;
 public class ClothPriceAddByWashModeDTO {
 
     @ApiModelProperty("衣服ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     @NotNull(message = "衣服ID不能为空")
     private Long clothId;
 

yiqi-common/src/main/java/com/yiqi/core/domain/vo/ClothFlawTopVo.java

@@ -17,7 +17,6 @@ import lombok.Data;
 public class ClothFlawTopVo {
 
     /** 衣服瑕疵置顶id */
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 衣服瑕疵名称 */

yiqi-common/src/main/java/com/yiqi/core/domain/vo/ClothHangerOrderRelationVO.java

@@ -32,7 +32,6 @@ public class ClothHangerOrderRelationVO {
      * 衣服名称id
      */
     @ApiModelProperty("衣服名称id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long clothId;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/vo/ClothItemVo.java

@@ -22,7 +22,6 @@ public class ClothItemVo extends BaseEntity {
 
     /** 衣服名称id */
     @ApiModelProperty("衣服名称id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 衣服名称 */

yiqi-common/src/main/java/com/yiqi/core/domain/vo/ClothItemWithPriceQueryVO.java

@@ -13,7 +13,6 @@ public class ClothItemWithPriceQueryVO {
 
     /** 衣服名称id */
     @ApiModelProperty("衣服名称id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 衣服名称 */

yiqi-common/src/main/java/com/yiqi/core/domain/vo/ClothWashModeRelationVO.java

@@ -25,7 +25,6 @@ public class ClothWashModeRelationVO extends BaseEntity
 
     /** 主键ID */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 洗衣方式ID */

yiqi-common/src/main/java/com/yiqi/core/domain/vo/GoodsCommentQueryVO.java

@@ -28,19 +28,15 @@ public class GoodsCommentQueryVO extends BaseEntity{
 
     @ApiModelProperty("编号")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     @ApiModelProperty("用户id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
     @ApiModelProperty("订单id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     @ApiModelProperty("商品id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long goodsId;
 
     @ApiModelProperty("商品类别")

yiqi-common/src/main/java/com/yiqi/core/domain/vo/GoodsInfoAddVO.java

@@ -27,7 +27,6 @@ public class GoodsInfoAddVO extends BaseEntity {
      * 商品编号
      */
     @ApiModelProperty("商品编号")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -42,7 +41,6 @@ public class GoodsInfoAddVO extends BaseEntity {
      */
     @Excel(name = "门店编号")
     @ApiModelProperty("门店编号")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long targetId;
 
 
@@ -66,7 +64,6 @@ public class GoodsInfoAddVO extends BaseEntity {
      */
     @Excel(name = "商品分类")
     @ApiModelProperty("商品分类")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long goodsCategoryId;
 
     /**

yiqi-common/src/main/java/com/yiqi/core/domain/vo/GoodsSkuQueryVO.java

@@ -30,7 +30,6 @@ public class GoodsSkuQueryVO  {
      * 主键id
      */
     @ApiModelProperty("主键id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 //
     /**
@@ -38,7 +37,6 @@ public class GoodsSkuQueryVO  {
      */
     @Excel(name = "商品编号")
     @ApiModelProperty("商品编号")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long goodsId;
 
     /**

yiqi-common/src/main/java/com/yiqi/order/domain/OrderClothAdjunct.java

@@ -30,7 +30,6 @@ public class OrderClothAdjunct extends BaseEntity {
      * 主键ID
      */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     @TableId(type = IdType.AUTO)
     private Long id;
 
@@ -47,7 +46,6 @@ public class OrderClothAdjunct extends BaseEntity {
      */
     @Excel(name = "附件ID")
     @ApiModelProperty("附件ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long adjunctId;
 
     /**
@@ -61,7 +59,6 @@ public class OrderClothAdjunct extends BaseEntity {
      * 订单ID
      */
     @ApiModelProperty("订单ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     /**
@@ -69,7 +66,6 @@ public class OrderClothAdjunct extends BaseEntity {
      */
     @Excel(name = "订单衣服ID")
     @ApiModelProperty("订单衣服ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderClothId;
 
     @Excel(name = "洗衣状态", readConverterExp = "0=待入厂，1=已入厂，2=已检查，3=已出厂，4=已上挂，5=已取衣，6=已到店、待送衣，7=送衣中，8=已送达、待评价，9=已完成，100=重洗，101=删除入厂，102=撤单")
@@ -77,11 +73,9 @@ public class OrderClothAdjunct extends BaseEntity {
     private String flowStatus;
 
     @ApiModelProperty("工厂ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long factoryId;
 
     @ApiModelProperty("门店ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long storeId;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -96,15 +90,12 @@ public class OrderClothAdjunct extends BaseEntity {
     @ApiModelProperty("出厂时间")
     private Date outFactoryTime;
 
-    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("入厂人员id")
     private Long inFactoryById;
 
-    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("出厂人员id")
     private Long outFactoryById;
 
-    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("检查人员id")
     private Long checkClothById;
 

yiqi-common/src/main/java/com/yiqi/order/domain/OrderClothDeliveryAddress.java

@@ -51,7 +51,6 @@ public class OrderClothDeliveryAddress extends BaseEntity
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 洗衣配送费订单 */
@@ -62,7 +61,6 @@ public class OrderClothDeliveryAddress extends BaseEntity
     /** 订单ID */
     @Excel(name = "订单ID")
     @ApiModelProperty("订单ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     /** 订单编号 */
@@ -71,13 +69,11 @@ public class OrderClothDeliveryAddress extends BaseEntity
     private String orderNo;
 
     @ApiModelProperty("客户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
     /** 配送员ID */
     @Excel(name = "配送员ID")
     @ApiModelProperty("配送员ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long deliveryManId;
 
     /** 配送公司ID */
@@ -101,7 +97,6 @@ public class OrderClothDeliveryAddress extends BaseEntity
     /** 地址ID */
     @Excel(name = "地址ID")
     @ApiModelProperty("地址ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long addressId;
 
     /** 衣服订单类型（0=收衣，1=取衣） */

yiqi-common/src/main/java/com/yiqi/order/domain/OrderClothItem.java

@@ -31,7 +31,6 @@ public class OrderClothItem extends BaseEntity
     /** 主键ID */
     @TableId(type = IdType.AUTO)
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 订单ID */

yiqi-common/src/main/java/com/yiqi/order/domain/OrderClothItemCouponRelation.java

@@ -28,19 +28,16 @@ public class OrderClothItemCouponRelation extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 优惠券ID */
     @Excel(name = "优惠券ID")
     @ApiModelProperty("优惠券ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long couponItemId;
 
     /** 订单ID */
     @Excel(name = "订单ID")
     @ApiModelProperty("订单ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     /** 订单编号 */
@@ -51,13 +48,11 @@ public class OrderClothItemCouponRelation extends BaseEntity
     /** 洗衣订单衣服关联ID */
     @Excel(name = "洗衣订单衣服关联ID")
     @ApiModelProperty("洗衣订单衣服关联ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderClothItemId;
 
     /** 衣服ID */
     @Excel(name = "衣服ID")
     @ApiModelProperty("衣服ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long clothId;
 
     /** 优惠前价格 */

yiqi-common/src/main/java/com/yiqi/order/domain/OrderClothItemFlowRecord.java

@@ -33,7 +33,6 @@ public class OrderClothItemFlowRecord extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 订单ID */

yiqi-common/src/main/java/com/yiqi/order/domain/OrderClothStatusRecord.java

@@ -27,13 +27,11 @@ public class OrderClothStatusRecord extends BaseEntity
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 订单编号 */
     @Excel(name = "订单编号")
     @ApiModelProperty("订单编号")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     /** 订单编号 */

yiqi-common/src/main/java/com/yiqi/order/domain/OrderGoods.java

@@ -33,7 +33,6 @@ public class OrderGoods extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/order/domain/OrderGoodsRefund.java

@@ -32,7 +32,6 @@ public class OrderGoodsRefund extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -54,7 +53,6 @@ public class OrderGoodsRefund extends BaseEntity {
      */
     @Excel(name = "门店ID")
     @ApiModelProperty("门店ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /**
@@ -69,7 +67,6 @@ public class OrderGoodsRefund extends BaseEntity {
      */
     @Excel(name = "客户ID")
     @ApiModelProperty("客户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
     /**

yiqi-common/src/main/java/com/yiqi/order/domain/OrderGoodsSku.java

@@ -28,25 +28,21 @@ public class OrderGoodsSku extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 订单ID */
     @Excel(name = "订单ID")
     @ApiModelProperty("订单ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     /** 订单编号 */
     @Excel(name = "订单编号")
     @ApiModelProperty("订单编号")
-    @JsonSerialize(using = ToStringSerializer.class)
     private String orderNo;
 
     /** 商品订单商品明细ID */
     @Excel(name = "商品订单商品明细ID")
     @ApiModelProperty("商品订单商品明细ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderGoodsItemId;
 
     /** 购买数量 */

yiqi-common/src/main/java/com/yiqi/order/domain/OrderRecharge.java

@@ -1,6 +1,8 @@
 package com.yiqi.order.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -35,7 +37,7 @@ public class OrderRecharge extends BaseEntity {
      * 主键ID
      */
     @ApiModelProperty("主键ID")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
@@ -50,7 +52,6 @@ public class OrderRecharge extends BaseEntity {
      */
     @Excel(name = "门店ID")
     @ApiModelProperty("门店ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long storeId;
 
     /**
@@ -72,7 +73,6 @@ public class OrderRecharge extends BaseEntity {
      */
     @Excel(name = "客户ID")
     @ApiModelProperty("客户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
     @ApiModelProperty("客户姓名")
@@ -168,7 +168,6 @@ public class OrderRecharge extends BaseEntity {
      */
     @Excel(name = "参与活动ID")
     @ApiModelProperty("参与活动ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long activityId;
 
     /**
@@ -176,7 +175,6 @@ public class OrderRecharge extends BaseEntity {
      */
     @Excel(name = "充值套餐ID")
     @ApiModelProperty("充值套餐ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long rechargeTypeId;
 
     /**

yiqi-common/src/main/java/com/yiqi/order/domain/OrderRechargeCouponRelation.java

@@ -25,7 +25,6 @@ public class OrderRechargeCouponRelation  extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/order/domain/OrderRechargeInstalment.java

@@ -32,7 +32,6 @@ public class OrderRechargeInstalment extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -83,7 +82,6 @@ public class OrderRechargeInstalment extends BaseEntity {
      */
     @Excel(name = "组织ID")
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /**

yiqi-common/src/main/java/com/yiqi/order/domain/OrderRefundInfo.java

@@ -30,7 +30,6 @@ public class OrderRefundInfo extends BaseEntity {
      */
     @ApiModelProperty("主键ID")
     @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

yiqi-common/src/main/java/com/yiqi/order/domain/dto/ActivityOrderDTO.java

@@ -20,7 +20,6 @@ public class ActivityOrderDTO {
     private Long activityId;
 
     @ApiModelProperty("客户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
     @ApiModelProperty("下单渠道（APP=APP，WXAPP=小程序）")
@@ -30,7 +29,6 @@ public class ActivityOrderDTO {
     private String sourceType;
 
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     @ApiModelProperty("付款平台(APP=APP、WEAPP=小程序)")

yiqi-common/src/main/java/com/yiqi/order/domain/dto/GoodsOrderQueryDTO.java

@@ -20,7 +20,6 @@ public class GoodsOrderQueryDTO {
     private String sourceType;
 
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     @ApiModelProperty("商品订单类型")

yiqi-common/src/main/java/com/yiqi/order/domain/dto/GoodsOrderRefundQueryDTO.java

@@ -21,7 +21,6 @@ public class GoodsOrderRefundQueryDTO {
     private String sourceType;
 
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     @ApiModelProperty("商品订单类型")

yiqi-common/src/main/java/com/yiqi/order/domain/dto/OrderGoodsRefundDTO.java

@@ -14,7 +14,6 @@ import javax.validation.constraints.NotNull;
 public class OrderGoodsRefundDTO {
 
     @ApiModelProperty("订单ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     @NotNull(message = "订单ID不能为空")
     private Long orderId;
 

yiqi-common/src/main/java/com/yiqi/order/domain/dto/OrderRechargeQueryDTO.java

@@ -15,7 +15,6 @@ public class OrderRechargeQueryDTO {
     private String orderNo;
 
     @ApiModelProperty("门店ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     @ApiModelProperty("来源类型")

yiqi-common/src/main/java/com/yiqi/order/domain/dto/weapp/AppGoodsMarketOrderDTO.java

@@ -28,7 +28,6 @@ public class AppGoodsMarketOrderDTO {
     private Boolean isDeduct;
 
     @ApiModelProperty("客户地址id")
-    @JsonSerialize(using = ToStringSerializer.class)
     @NotNull(message = "客户地址不能为空")
     private Long appUserAddressId;
 

yiqi-common/src/main/java/com/yiqi/order/domain/dto/weapp/AppGoodsOrderRePayDTO.java

@@ -24,8 +24,6 @@ public class AppGoodsOrderRePayDTO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("订单ID")
-    @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     @ApiModelProperty("付款平台(APP=APP、WEAPP=小程序)")

yiqi-common/src/main/java/com/yiqi/order/domain/vo/GoodsOrderQueryVO.java

@@ -21,8 +21,6 @@ public class GoodsOrderQueryVO {
      * 主键ID
      */
     @ApiModelProperty("主键ID")
-    @TableId(type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -44,7 +42,6 @@ public class GoodsOrderQueryVO {
      */
     @Excel(name = "组织ID")
     @ApiModelProperty("组织ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /**
@@ -52,11 +49,9 @@ public class GoodsOrderQueryVO {
      */
     @Excel(name = "客户ID")
     @ApiModelProperty("客户ID")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
     @ApiModelProperty("客户地址id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserAddressId;
 
     /**

yiqi-common/src/main/java/com/yiqi/order/domain/vo/OrderDeliveryVO.java

@@ -58,7 +58,6 @@ public class OrderDeliveryVO implements Serializable {
     /**
      * 客户ID
      */
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
     @Excel(name = "客户姓名")
     private String userName;
@@ -115,7 +114,6 @@ public class OrderDeliveryVO implements Serializable {
      * 外部订单id
      */
     @Excel(name = "外部订单id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long transOrderId;
 
     /**

yiqi-common/src/main/java/com/yiqi/order/domain/vo/OrderPayResultVO.java

@@ -21,14 +21,12 @@ public class OrderPayResultVO {
      * 是否成功  0未支付 100 支付中等待结果   101 ：支付失败   200 成功
      */
     @ApiModelProperty("支付结果")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Integer payResult = 0;
 
     @ApiModelProperty("支付返回")
     private String payMsg = "支付成功";
 
     @ApiModelProperty("订单id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
     @ApiModelProperty("订单编号")