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

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

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

@@ -22,6 +22,7 @@
public class WarningRuleDetail  extends LoginUserModel {

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