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

apps/web-ele/src/views/_core/profile/modules/user-social.vue

@@ -176,9 +176,7 @@ onMounted(() => {
             />
             <div class="flex flex-1 items-center justify-between">
               <div class="flex flex-col">
-                <h4
-                  class="mb-[4px] text-[14px] text-black/85 dark:text-white/85"
-                >
+                <h4 class="mb-1 text-sm text-black/85 dark:text-white/85">
                   {{ getDictLabel(DICT_TYPE.SYSTEM_SOCIAL_TYPE, item.type) }}
                 </h4>
                 <span class="text-black/45 dark:text-white/45">
@@ -186,9 +184,9 @@ onMounted(() => {
                     {{ item.socialUser?.nickname || item.socialUser?.openid }}
                   </template>
                   <template v-else>
-                    绑定{{
-                      getDictLabel(DICT_TYPE.SYSTEM_SOCIAL_TYPE, item.type)
-                    }}账号
+                    绑定
+                    {{ getDictLabel(DICT_TYPE.SYSTEM_SOCIAL_TYPE, item.type) }}
+                    账号
                   </template>
                 </span>
               </div>

apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue

@@ -65,6 +65,7 @@ const [Modal, modalApi] = useVbenModal({
       // 使用 formData.value 作为基础，确保 rules 来自 formData
       const data = { ...values, ...formData.value };
       if (data.startAndEndTime && Array.isArray(data.startAndEndTime)) {
+        // TODO @puhui999：这里 ele 会告警；antd 不会告警，可能要看看；
         data.startTime = Number(data.startAndEndTime[0]);
         data.endTime = Number(data.startAndEndTime[1]);
         delete data.startAndEndTime;