Merge branch 'master' into dev-1.1.2

wupengfei

6 小时以前 0ae2f2f277c9a20648e2b53a804b443e412b523a

 src/views/TraceIdLogManage/ThreeResourceLogs.vue

@@ -143,9 +143,7 @@
            v-if="row.createdUser"
            type="primary"
            link
            @click="
              handleAdd({ json: { createdUser: JSON.parse(JSON.stringify(row.createdUser)) } })
            "
            @click="handleAdd({ json: { createdUser: row.createdUser } })"
            >查看</el-button
          >
        </template>
@@ -209,7 +207,7 @@
        pageModel: {
          rows: pageSize,
          page: pageIndex,
          // orderInput: extraParamState.orderInput,
          orderInput: extraParamState.orderInput,
        },
        createdTimeBegin: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
        createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
@@ -270,7 +268,7 @@
      request: JSON.parse(row.request),
      responseHeaders: JSON.parse(row.responseHeaders),
      response: JSON.parse(row.response),
      createdUser: JSON.parse(JSON.stringify(row.createdUser)),
      createdUser: row.createdUser,
    },
  });
}