Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRule.java

@@ -24,6 +24,7 @@
public class WarningRule  extends LoginUserModel {

    @ApiModelProperty(value = "主键", example = "1")
    @TableId(type = IdType.AUTO)
    @ExcelColumn(name="主键")
    private Integer id;