Merge refs/remotes/origin/master into refs/heads/master

zhongshujie

2024-12-20 32986b54a0e2661f7ad6ed79f3ef12c4289eace9

 packageBookService/pages/psychologyAnswer/testdata/index.js

@@ -45,7 +45,8 @@
          }
        ]
      ],
      "list": [{
      "list": [
        {
          "analysisCon": "略",
          "id": "0C85D525",
          "optionIndex": 0,
@@ -2701,7 +2702,8 @@
          }
        ]
      }],
      "list": [{
      "list": [
        {
          "analysisCon": "略",
          "id": "3P1E1B001",
          "optionStyle": "Txt",