diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java index 51fd0d39..ddb5d796 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java @@ -65,12 +65,12 @@ public class XhpcActivityDiscountDomain implements Serializable { /** * 状态(0-编辑,1-提交待审核,2-审核失败,3-审核通过,4-立即失效) */ - private Short status = 0; + private Integer status = 1; /** * 删除标识(0-正常,2-删除) */ - private Short delFlag = 0; + private Integer delFlag = 0; /** * 创建人 diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml index f5a96e19..02c3cd1e 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml @@ -12,8 +12,8 @@ - - + + @@ -202,7 +202,7 @@ select from xhpc_activity_discount ad - where ad.del_flag=0 and ad.status=#{status} and ad.template_id=#{params.template} + where ad.del_flag=0 and ad.status=#{status} and ad.template_id=#{templateId} @@ -211,7 +211,6 @@ select from xhpc_activity_discount ad - where ad.del_flag=#{delflag} and ad.template_id=#{params.template} - + where ad.del_flag=#{delflag} and ad.template_id=#{templateId} \ No newline at end of file