Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 951b06c1aaa8cc4c83f9e4b4ba9fae066fd84941

 ruoyi-system/src/main/java/com/ruoyi/system/model/TProblemEscalation.java

@@ -36,7 +36,7 @@

    @ApiModelProperty(value = "问题类型id")
    @TableField("escalation_type")
    private Integer escalationType;
    private String escalationType;

    @ApiModelProperty(value = "上报内容")
    @TableField("escalation_content")