From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期四, 20 六月 2019 17:04:11 +0800 Subject: [PATCH] 冲突文件 --- fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java index 9db0191..af70360 100644 --- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java +++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java @@ -21,6 +21,15 @@ * */ private static final long serialVersionUID = 1L; + + public final static int SEX_DEFAULT = 0; // 閫氱敤 + public final static int SEX_WOMAN = 1; // 濂� + public final static int SEX_MAN = 2; // 鐢� + public final static int SEX_DEFAULT_WOMAN = 10; // 濂�+ 閫氱敤 + public final static int SEX_DEFAULT_MAN = 20; // 鐢�+ 閫氱敤 + public final static int SEX_MAN_WOMAN = 12; // 鐢�+ 濂� + + public final static int SEX_ALL = 120; // 鐢�+ 濂� + 閫氱敤 @Expose @Column(name = "id") -- Gitblit v1.8.0