Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

# Conflicts: # src/views/mall/statistics/member/index.vue
2025-07-15 03:15:07 +08:00 · 2023-10-17 19:02:37 +08:00
parent 66ec610801 0242c84196
commit aa99c53729
27 changed files with 856 additions and 98 deletions
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@ -205,6 +205,9 @@ export const floatToFixed2 = (num: number | string | undefined): string => {
    case 1:
      str = f.toString() + '0'
      break
+    case 2:
+      str = f.toString()
+      break
  }
  return str
 }