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

fuliqi

2025-02-20 a1278f8b1edebde8114ca4add0f32d74495a835b

 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java

@@ -22,25 +22,21 @@
    /**
     * dataType为1：卡口内码   dataType为2或11：采集设备内码
     */
    @TextIndexed
    private String indexCode;

    /**
     * 设备或卡口国标编码
     */
    @TextIndexed
    private String externalIndexCode;

    /**
     * 设备或卡口名称
     */
    @TextIndexed
    private String deviceName;

    /**
     * 组织编号
     */
    @TextIndexed
    private String orgCode;

    /**
@@ -73,6 +69,7 @@
     */
    private String resultTypeText;

    private String ip;
    public String getResultTypeText() {
        if (Objects.equals(resultType, 1)) {
            resultTypeText = "正常";