Merge remote-tracking branch 'origin/master'

Tcsm

2023-05-26 fe37beed44df3d9f98aad764f3977b18ef557784

 ruoyi-ui/src/views/pet/petInfo.vue

@@ -414,17 +414,11 @@
      this.loading = true;
    //   this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
    //   this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

      // console.log(this.queryParams)
      this.queryParams.pid = this.pid;
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listPetnote(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          console.log(response.data)
          this.PetNoteList = response.data.data;

          this.total = response.data.total;
      getPetnoteList(this.pid).then(response => {
          this.PetNoteList = response.data;
          this.total = response.data.length;
          this.loading = false;
        }
      );