Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into gyq

2025-10-17 11:32:29 +08:00
parent 6fc5bd013c 696a1735db
commit dc0cd2076c
2 changed files with 2 additions and 1 deletions
--- a/.husky/commit-msg
+++ b/.husky/commit-msg
@@ -1 +1 @@
-npx --no-install commitlint --edit $1
+# npx --no-install commitlint --edit $1
--- a/src/views/marketing_center/birthdayGift/index.vue
+++ b/src/views/marketing_center/birthdayGift/index.vue
@@ -123,6 +123,7 @@ const basicForm = reactive({
 function editPlan(row, index) {
  refDialogPlans.value.open(toRaw(row), index);
 }
+
 function returnDeliverDate(row) {
  if (row.deliverDate === "advance") {
    return "提前" + Math.abs(row.deliverTime) + "天";