Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 8375e9e258 Merge #35 into master from cc_20260128_fix 正新 2026-01-29 09:50:34 +00:00
• a8fe891b70 feat:加盟合同审批 使用招商所属区域 suzhuhong 2026-01-27 09:42:33 +08:00
• aa250fa6d0 Merge remote-tracking branch 'origin/master' suzhuhong 2026-01-23 16:39:49 +08:00
• 6d55e5fcdf feat:发布 suzhuhong 2026-01-23 16:39:34 +08:00
• 3206a20dd6 Merge #34 into master from cc_20260116_new_field 王非凡 2026-01-23 08:37:13 +00:00
• 10dca9bf9b Merge #32 into master from cc_20260113_open 正新 2026-01-23 06:49:50 +00:00
• 41ae24478d Merge #31 into master from cc_2021104_twelve_points 王非凡 2026-01-23 06:48:53 +00:00
• 1b1684f373 Merge #33 into master from cc_20260106_point_update 正新 2026-01-23 06:48:32 +00:00
• 44ba00dc38 feat:加盟费待缴费发送时间调整 suzhuhong 2026-01-23 14:18:48 +08:00
• 96047eeb99 fix:推送合同 suzhuhong 2026-01-22 09:30:48 +08:00
• dc22d18322 fix:加盟合同财务阶段 财务之后推送 默认一小时自动分配 suzhuhong 2026-01-21 19:04:44 +08:00
• 399e46033f fix:加盟阶段bug处理 suzhuhong 2026-01-20 10:32:57 +08:00
• c28515123a Merge #30 into master from cc_20260106_process_change 王非凡 2026-01-19 09:11:34 +00:00
• eb9b8bdf00 Merge #29 into master from cc_20260114_selectPoint 正新 2026-01-19 07:11:31 +00:00
• e11327f837 Merge #27 into master from cc_20260116_fix 正新 2026-01-19 07:05:53 +00:00
• 0ad517dce6 Merge #28 into master from cc_20260114_fix 正新 2026-01-19 07:05:42 +00:00
• 159f112113 feat:添加授权码展示 suzhuhong 2026-01-16 16:45:01 +08:00
• dd1ba96380 feat:添加授权码展示 suzhuhong 2026-01-16 16:44:47 +08:00
• 82a49a03d2 Merge #26 into master from cc_20260105_partner 正新 2026-01-14 11:03:42 +00:00
• 08845557fd feat:开业验收其他角色 返回空 suzhuhong 2026-01-14 17:35:56 +08:00
• a9d876b320 feat:开业验收其他角色 返回空 suzhuhong 2026-01-14 17:15:06 +08:00
• 6a3d589d0c Merge #25 into master from cc_20260113_fix 正新 2026-01-13 07:17:35 +00:00
• e62cd9bff9 Merge #24 into master from cc_20260107_fix_bug 王非凡 2026-01-07 02:01:12 +00:00
• a2262f8ea7 feat:测试 suzhuhong 2026-01-06 15:56:01 +08:00
• 8c8109d535 feat:正新鸡排统管默认都是是 不根据填写的来 suzhuhong 2026-01-06 14:16:40 +08:00
• 81ea1fbe5f fix:分配 suzhuhong 2026-01-06 10:23:43 +08:00
• 8954d56f45 Merge #23 into master from cc_20260105_fix 苏竹红 2026-01-05 13:00:42 +00:00
• 2e942501be fix:优化查询 suzhuhong 2026-01-05 18:10:45 +08:00
• 8cdc53c609 fax:订货 suzhuhong 2026-01-05 18:02:36 +08:00
• a5068586e0 fax:订货 suzhuhong 2026-01-05 17:29:01 +08:00
• 82e875142b Merge remote-tracking branch 'origin/master' suzhuhong 2026-01-05 17:27:02 +08:00
• 3ff8aa2245 Merge branch 'cc_20260105_fix' suzhuhong 2026-01-05 17:26:46 +08:00
• 03af3e0c1d Merge #22 into master from cc_20260105_fix 苏竹红 2026-01-05 09:22:27 +00:00
• 679b697b1b Merge #21 into master from cc_20260105_fix 苏竹红 2026-01-05 09:07:48 +00:00
• b897690274 fax:订货 suzhuhong 2026-01-05 17:07:13 +08:00
• f6b2b4ccf5 Merge #20 into master from cc_20260105_fix 苏竹红 2026-01-05 08:39:42 +00:00
• dbb4d61f9b feat:代办+督导改为招商经理 suzhuhong 2026-01-05 16:38:43 +08:00
• 876b00b9ad fix：内勤能看到 招商数据与运营区域数据 suzhuhong 2026-01-04 18:15:59 +08:00
• 784f34f993 fix：编码发生变动 推送数据 suzhuhong 2026-01-02 16:05:27 +08:00
• 0fefc7773f fix：招商经理 suzhuhong 2026-01-02 12:26:05 +08:00
• 8f6ed072d1 fix：内勤看所有管辖范围的数据 suzhuhong 2026-01-02 12:15:07 +08:00
• 2eaa1533c2 fix:店-招商经理关系 suzhuhong 2026-01-02 11:54:49 +08:00
• e34aea7a40 Merge #19 into master from cc_20251223_orgChange 王非凡 2025-12-31 06:56:47 +00:00
• 4b7a35c96c Merge #18 into master from cc_20251114_minor_req 王非凡 2025-12-26 08:55:27 +00:00
• f279db70a3 fix:人员门店支持关键字keywork搜索 suzhuhong 2025-12-25 20:08:02 +08:00
• 655b9a8f17 fix:人员门店支持关键字keywork搜索 suzhuhong 2025-12-25 20:01:24 +08:00
• e97c147fac Merge #17 into master from cc_20251218_opening 苏竹红 2025-12-25 10:50:38 +00:00
• 32ae1b7315 Merge #16 into master from cc_20250916_new 王非凡 2025-12-19 09:07:35 +00:00
• bd2d97130a Merge #15 into master from cc_20251218_opening 苏竹红 2025-12-18 08:31:25 +00:00
• a273b37a73 Merge #14 into master from cc_20251218_opening 苏竹红 2025-12-18 08:29:16 +00:00
• dd58d70fa2 feta:切换 suzhuhong 2025-12-17 14:05:29 +08:00
• cf5d16b822 Merge #13 into master from cc_20251211_jinjian 苏竹红 2025-12-15 09:43:50 +00:00
• 9769aba30c Merge #12 into master from cc_20251215_xinfa 苏竹红 2025-12-15 09:42:30 +00:00
• b4b4d0b988 Merge #11 into master from cc_20251114_minor_req 王非凡 2025-12-11 09:09:27 +00:00
• 1e6912bf59 Merge #10 into master from cc_20251110_ossupdate 苏竹红 2025-12-11 01:08:26 +00:00
• fa66ef7d01 feat:setStoreCode 苏竹红 2025-12-10 22:37:23 +08:00
• 654ffe672e feat:setStoreCode 苏竹红 2025-12-10 14:30:48 +08:00
• f87b1ca866 feat:小程序版本过低 苏竹红 2025-12-09 18:43:53 +08:00
• c6310e7a96 feat:businessType 苏竹红 2025-12-09 18:33:36 +08:00
• 527be5e13d feat:1 苏竹红 2025-12-09 17:12:53 +08:00
• f8e537ed44 feat:1 苏竹红 2025-12-09 17:11:36 +08:00
• 4be2276287 Merge #8 into master from cc_20250922_closeStore_w 王非凡 2025-12-09 08:55:47 +00:00
• 1b0fb1b034 Merge #9 into master from cc_20251208_bank 苏竹红 2025-12-09 08:55:37 +00:00
• aaaa40f2c8 Merge #7 into master from cc_20251209_dict 王非凡 2025-12-09 07:49:16 +00:00
• a444130b21 feat:bot 苏竹红 2025-12-09 15:39:43 +08:00
• 77da8be294 feat:直营 苏竹红 2025-12-09 11:32:27 +08:00
• d7c8dd21fd Merge #6 into master from cc_20251203_bugfix 苏竹红 2025-12-09 03:12:33 +00:00
• 2237ed3f4a feat:openBasicInfoDTO 苏竹红 2025-12-05 14:07:43 +08:00
• d3d6ffb9ce feat:openBasicInfoDTO 苏竹红 2025-12-04 19:16:04 +08:00
• c812021fad Merge #5 into master from cc_20251114_minor_req 王非凡 2025-12-04 10:22:48 +00:00
• 7b8f220c26 Merge remote-tracking branch 'origin/master' 苏竹红 2025-12-04 18:22:25 +08:00
• 26d9dd7800 feat:openBasicInfoDTO 苏竹红 2025-12-04 18:22:17 +08:00
• 9a62d2e0c0 Merge #2 into master from cc_20251112_wallet 王非凡 2025-12-04 09:48:29 +00:00
• edbec8d8c1 Merge #3 into master from cc_20251114_minor_req 王非凡 2025-12-04 09:48:19 +00:00
• e57f8c7925 Merge #4 into master from cc_20251027_new2 王非凡 2025-12-04 09:48:08 +00:00
• 43f37734b4 feat:openBasicInfoDTO 苏竹红 2025-12-04 17:46:24 +08:00
• 30ae3fb841 feat:正新鸡排优惠 苏竹红 2025-12-04 16:24:44 +08:00
• 1e6fcd683c feat:discountAmount 苏竹红 2025-12-04 16:11:53 +08:00
• 5f2fcf944e feat:regionName 苏竹红 2025-12-04 14:53:48 +08:00
• fb01212593 feat:合同数据 苏竹红 2025-12-04 14:27:47 +08:00
• b715feef7f feat:门店id 门店编号 限制 苏竹红 2025-12-04 13:50:07 +08:00
• 1a9138aaa4 feat:getCashierFee 苏竹红 2025-12-04 10:21:57 +08:00
• 3e2b89e254 feat:开户支行不为空 苏竹红 2025-12-03 19:55:47 +08:00
• a1a3b52516 Merge #1 into master from cc_20251112_wallet 苏竹红 2025-12-03 09:36:25 +00:00
• 580c019e34 Merge branch 'cc_2021104_twelve_points' into 'master' 苏竹红 2025-12-02 11:35:47 +00:00
• 08f7671427 fix wangff 2025-12-02 19:35:17 +08:00
• 1cbd411598 Merge branch 'refs/heads/master' into cc_2021104_twelve_points wangff 2025-12-02 19:34:14 +08:00
• 44ffaf30bf Merge branch 'cc_20250905_franchiseAgreement' into 'master' 苏竹红 2025-12-02 10:52:41 +00:00
• e529a36c32 feat:正新三明治 苏竹红 2025-12-02 18:49:50 +08:00
• c9efff2456 feat:contractEndTime 苏竹红 2025-12-02 18:35:13 +08:00
• 82dc2cd47f feat:待缴费才能操作 苏竹红 2025-12-02 18:04:05 +08:00
• 7d69b4ce05 Merge branch 'cc_20250905_franchiseAgreement' into 'master' 苏竹红 2025-12-02 09:56:59 +00:00
• 8091a61917 Merge branch 'cc_20251114_minor_req' into 'master' 苏竹红 2025-12-02 09:55:44 +00:00
• c1e917ecda fix:门店开放接口新增省市区字段 wangff 2025-12-02 15:36:50 +08:00
• 597baa82b9 feat:合同 苏竹红 2025-12-02 14:03:57 +08:00
• 8b250b7449 feat:合同 苏竹红 2025-12-02 13:46:57 +08:00
• 7dd72ac50c Merge branch 'cc_20251104_xinfa' into 'master' 苏竹红 2025-12-01 08:48:03 +00:00
• d062009c56 fix wangff 2025-12-01 16:37:40 +08:00
• 587800ea9d feat:WALLET_API_ERROR 苏竹红 2025-12-01 15:24:12 +08:00
• 71c6446cd3 feat:门店编码查询 苏竹红 2025-12-01 13:56:39 +08:00