bruce преди 2 години
родител
ревизия
9e0eb361b4

+ 1 - 2
imcs-bt-be/imcs-authority-entity/src/main/java/com/github/zuihou/authority/entity/core/Org.java

@@ -21,10 +21,9 @@ import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
  * @since 2019-10-20
  */
 @TableName("c_core_org")
-@Accessors(chain = true)
 @ApiModel(value = "Org", description = "组织")
-@Data @Builder @NoArgsConstructor @AllArgsConstructor
 @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true)
+@Data @Builder @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true)
 public class Org extends TreeEntity<Org, Long>
 {
     private static final long serialVersionUID = 1L;

+ 4 - 2
imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/interceptor/TokenHandlerInterceptor.java

@@ -167,8 +167,10 @@ public class TokenHandlerInterceptor extends HandlerInterceptorAdapter {
      *
      * @return
      */
-    protected boolean isIgnoreToken(String uri) {
-        return ignoreTokenProperties.isIgnoreToken(uri);
+    protected boolean isIgnoreToken(String uri)
+    {
+        return true;
+        //return ignoreTokenProperties.isIgnoreToken(uri);
     }
 
     @Override

+ 0 - 23
imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/goods/entity/Goods.java

@@ -40,7 +40,6 @@ public class Goods extends Entity<Long>
     @Excel(name = "商品分类id")
     @NotNull(message = "请选择商品分类")
     private Long goodsCateId;
-
     /**
      * 商品分类名称
      */
@@ -48,8 +47,6 @@ public class Goods extends Entity<Long>
     @TableField("goods_cate_name")
     @Excel(name = "商品分类名称")
     private String goodsCateName;
-
-
     /**
      * 商品名称
      */
@@ -60,7 +57,6 @@ public class Goods extends Entity<Long>
     @NotBlank(message = "商品名称不得为空")
     @Length(max = 30, message = "商品名称长度不能超过30")
     private String goodsName;
-
     /**
      * 商户id
      */
@@ -68,7 +64,6 @@ public class Goods extends Entity<Long>
     @TableField("goods_shop_id")
     @Excel(name = "商户id")
     private Long goodsShopId;
-
     /**
      * 商品状态 (1正常  0冻结)
      */
@@ -78,7 +73,6 @@ public class Goods extends Entity<Long>
     @Excel(name = "商品状态 (1正常  0冻结)")
     @NotBlank(message = "请选择商品状态")
     private String goodsStatus;
-
     /**
      * 品牌id
      */
@@ -87,7 +81,6 @@ public class Goods extends Entity<Long>
     @TableField(value = "goods_brand_id", condition = LIKE)
     @Excel(name = "品牌id")
     private String goodsBrandId;
-
     /**
      * 商品图片
      */
@@ -97,7 +90,6 @@ public class Goods extends Entity<Long>
     @Excel(name = "商品图片")
     @NotBlank(message = "请添加商品图片")
     private String goodsPic;
-
     /**
      * 商品详情图片
      */
@@ -107,10 +99,6 @@ public class Goods extends Entity<Long>
     @Excel(name = "商品详情图片")
     @NotBlank(message = "请添加商品详情图片")
     private String goodsDetailPic;
-
-
-
-
     /**
      * 商品编码
      */
@@ -121,7 +109,6 @@ public class Goods extends Entity<Long>
     @NotBlank(message = "商品编码不可为空")
     @Length(max = 30, message = "品牌id长度不能超过30")
     private String goodsCode;
-
     /**
      * 商品单位
      */
@@ -131,7 +118,6 @@ public class Goods extends Entity<Long>
     @Excel(name = "商品编码")
     @NotBlank(message = "商品单位不可为空")
     private String goodsUnit;
-
     /**
      * 商品标签
      */
@@ -142,7 +128,6 @@ public class Goods extends Entity<Long>
     @NotBlank(message = "商品标签不可为空")
     @Length(max = 10 ,message = "商品标签长度不得超过10")
     private String goodsTag;
-
     /**
      * 商品权重
      */
@@ -152,9 +137,6 @@ public class Goods extends Entity<Long>
     @Excel(name = "商品标签")
     @NotBlank(message = "商品权重布恩为空")
     private String goodsWeight;
-
-
-
     /**
      * 商品销售类型
      */
@@ -164,7 +146,6 @@ public class Goods extends Entity<Long>
     @Excel(name = "商品销售类型")
     @NotBlank(message = "商品销售类型不可为空")
     private String goodsSaleType;
-
     /**
      * 虚拟浏览量
      */
@@ -194,7 +175,6 @@ public class Goods extends Entity<Long>
     @TableField(value = "goods_rel_sales", condition = LIKE)
     @Excel(name = "真实销量")
     private Long goodsRelSales;
-
     /**
      * 商品价格
      */
@@ -202,17 +182,14 @@ public class Goods extends Entity<Long>
     @TableField("goods_price")
     @Excel(name = "商品价格")
     private BigDecimal goodsPrice;
-
     @TableField(exist = false)
     private List<Spe> goodsSpec;
-
     /**
      * 所属区域id
      */
     @ApiModelProperty(value = "所属区域id")
     @NotNull(message = "请选择所属区域")
     private Long regionId;
-
     /**
      * 所属区域
      */

+ 1 - 1
imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/place/entity/Place.java

@@ -220,4 +220,4 @@ public class Place extends Entity<Long>
      */
     @TableField(exist = false)
     private String region;
-}
+}