Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-20 9f122a41255d18f04a82d8be3b038a95c2c18d95

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java

@@ -9,6 +9,16 @@
@TableName("work_approve")
public class EmergencyWorkApproveInfo {

    private Integer sort ;

    public Integer getSort() {
        return sort;
    }

    public void setSort(Integer sort) {
        this.sort = sort;
    }

    @TableId(type = IdType.AUTO)
    private Long id;