Merge branch 'master-base' into master-fwq-爆款活动2.0

fwq

2024-07-17 cb7bf61ddec695b25f8fe509815c5e5794180b0f

 phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java

@@ -39,10 +39,10 @@
     *          (是否自定义标签 否)"isCustom": 0,
     *          (标签类型编号)"typeNo": "constellation",
     *          (标签编号)"tagNo": "LA20220506bRnJDj"
     *                },
     *        {
     *          },
     *          {
     *          (是否自定义标签 是)"isCustom": 1,
     *          (标签类型编号 没有类型可以为空或不传)"typeNo": "constellation",
     *           (标签类型编号)"typeNo": "constellation",
     *          (标签编号)"tagName": "牛马座"
     *        }
     *    ],