Merge branch 'wb' of http://blit.7drlb.com:8888/r/moral into qa

jinpengyong

2023-11-13 471f693ac87a6ed6a2b00e93472b025266c0271f

 screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java

@@ -139,6 +139,13 @@
    @TableField(exist = false)
    private String time;

    @TableField(exist = false)
    private String unitName;
    @TableField(exist = false)
    private String escalationUnitName;
    @TableField(exist = false)
    private String polluteTypeName;


    public static AllocationVo convert(AllocationExt allocationExt) {
        AllocationVo allocationVo = BeanConverts.convert(allocationExt, AllocationVo.class);