Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 211195f387 feat:人员null指针处理 master suzhuhong 2026-06-01 09:53:48 +08:00
• f749f97911 Merge #152 into master from cc_20260528_fix 正新 2026-05-29 01:38:05 +00:00
• 94ee7b7d12 Merge #151 into master from cc_20260519_fix 正新 2026-05-27 06:13:55 +00:00
• 526482aab8 Merge #150 into master from cc_20260408_close_up_v2 王非凡 2026-05-27 01:44:13 +00:00
• 567ff3536f Merge #149 into master from cc_20260408_close_up_v2 王非凡 2026-05-26 09:21:02 +00:00
• ce882e5d87 feat:阶段子状态完成-校验门店状态 suzhuhong 2026-05-25 18:41:22 +08:00
• 555f4cd089 Merge #148 into master from cc_20260522_close_up_fix 王非凡 2026-05-22 09:44:13 +00:00
• e305fa8d95 Merge remote-tracking branch 'origin/master' suzhuhong 2026-05-21 17:56:04 +08:00
• 5e8cb275fe fix:培训登记 suzhuhong 2026-05-21 17:55:57 +08:00
• 0a62114639 Merge #147 into master from cc_20250922_closeStore_w 王非凡 2026-05-21 09:39:32 +00:00
• 3d31c69b5b Merge #146 into master from cc_20260520_declare_goods 王非凡 2026-05-21 09:38:59 +00:00
• ca54dc5468 Merge #145 into master from cc_20260521_fix 王非凡 2026-05-21 08:33:56 +00:00
• 964746fd9e fix:更新完成时间 suzhuhong 2026-05-21 16:12:09 +08:00
• df356c3aa6 fix:流程处理人 suzhuhong 2026-05-21 15:23:34 +08:00
• 25d2be65be fix:运营顾问审批 suzhuhong 2026-05-21 14:15:47 +08:00
• a7ad83d15a fix:bug处理 suzhuhong 2026-05-21 09:35:28 +08:00
• 3e227cc5fb Merge #144 into master from cc_20260520_unify_merge 王非凡 2026-05-20 08:44:35 +00:00
• b89e8c9352 feat:operationLogService suzhuhong 2026-05-20 15:58:03 +08:00
• 9c7800164b Merge #141 into master from cc_20260511_fix_bug 王非凡 2026-05-19 10:23:51 +00:00
• 41e6b3ccfe Merge #142 into master from cc_20260515_audio_ge 王非凡 2026-05-19 10:23:43 +00:00
• e6bcfac086 Merge #140 into master from cc_20260513_minor_req 王非凡 2026-05-18 09:30:59 +00:00
• 451b95f909 Merge #139 into master from cc_20260515_fix 正新 2026-05-15 09:45:13 +00:00
• 605c6435f8 Merge #138 into master from cc_20260515_decoration_update 王非凡 2026-05-15 08:52:31 +00:00
• 05d4726bdf 更新 PointServiceImpl.java 正新 2026-05-15 13:38:50 +08:00
• bfdeeac850 feat:失败原因展示 suzhuhong 2026-05-14 14:57:56 +08:00
• 1881101f2a Merge #137 into master from cc_20260408_close_up 王非凡 2026-05-13 09:14:52 +00:00
• 150b709b74 Merge #136 into master from cc_20260508_adjustment 正新 2026-05-13 08:50:21 +00:00
• a2648eaed4 Merge #135 into master from cc_20260511_isTrainComplete 正新 2026-05-13 08:11:26 +00:00
• b4e7953aaf Merge #134 into master from cc_20260513_soreDone 正新 2026-05-13 07:09:51 +00:00
• 52cc142e81 Merge #133 into master from cc_20260512_merge_fix 正新 2026-05-12 10:14:59 +00:00
• 8caf3b1a6a Merge #132 into master from revert-56b85c33-20f063dc 正新 2026-05-12 09:56:16 +00:00
• fcb6fb0770 Merge remote-tracking branch 'origin/master' suzhuhong 2026-05-12 17:16:35 +08:00
• b7757af11c feat:merge冲突 suzhuhong 2026-05-12 17:16:23 +08:00
• e667f2b577 Merge #129 into master from cc_20260512_point_zx 王非凡 2026-05-12 09:05:52 +00:00
• 20f063dc55 Merge #128 into master from cc_20250512_uploadRentContract 正新 2026-05-12 09:01:35 +00:00
• 56b85c3322 Merge #126 into master from cc_20260408_close_up 王非凡 2026-05-12 08:13:30 +00:00
• 27af1561ac Merge #127 into master from cc_20260512_fix 正新 2026-05-12 08:13:22 +00:00
• 3c52808fc5 feat://V3.0 调整为加盟合同开始之后 直接开启 但是有部分已经到了待分配运营顾问 需要校验数据 如果证照没有开始 就说明是这类数据 就初始化 suzhuhong 2026-05-12 16:01:42 +08:00
• 0d65a1c4e9 Merge #123 into master from cc_20260511_fix_bug 王非凡 2026-05-11 10:24:00 +00:00
• b517bfa957 Merge #125 into master from cc_20260511_fix 正新 2026-05-11 10:23:53 +00:00
• 5568f6678d Merge #124 into master from cc_20260511_fix 正新 2026-05-11 09:01:25 +00:00
• ae241d40ca Merge #122 into master from cc_20260511_fix 正新 2026-05-11 04:20:57 +00:00
• fd43c2c4b2 Merge #121 into master from cc_20260511_fix 正新 2026-05-11 04:15:31 +00:00
• 162674c0b2 Merge #119 into master from cc_20260508_open_store_req 王非凡 2026-05-10 13:44:42 +00:00
• a42a109b6c Merge #120 into master from cc_20250922_closeStore_w 王非凡 2026-05-10 13:41:41 +00:00
• b9b022a28d Merge #118 into master from cc_20260506_newsign 正新 2026-05-10 13:10:42 +00:00
• 814bbc342e Merge #116 into master from cc_20260226_fix 王非凡 2026-05-09 09:03:20 +00:00
• 070d771587 Merge #117 into master from cc_20260509_fix 正新 2026-05-09 08:19:49 +00:00
• e813a56927 feat:装修阶段处理 suzhuhong 2026-05-09 15:46:51 +08:00
• 764247ab1d Merge #114 into master from cc_20260226_fix 王非凡 2026-05-08 10:02:06 +00:00
• 3fe65a48e0 Merge #115 into master from cc_20260507_smz 正新 2026-05-08 07:11:17 +00:00
• 585a978f32 Merge #113 into master from cc_20260429_bug 正新 2026-04-29 07:00:35 +00:00
• 0b98bd4bb6 Merge #112 into master from cc_20260429_fix 正新 2026-04-29 05:39:17 +00:00
• 22fcfc6a90 Merge #111 into master from cc_20260417_bonus 王非凡 2026-04-27 10:41:08 +00:00
• 97f8a8669c Merge #110 into master from cc_2026_0422_feat_miniMap 王非凡 2026-04-27 10:12:33 +00:00
• 19f119bbc6 feat：bug修复 suzhuhong 2026-04-24 18:48:44 +08:00
• 449f409522 feat：导出 suzhuhong 2026-04-24 18:15:25 +08:00
• 7385dc1d03 feat：导出 suzhuhong 2026-04-24 18:07:03 +08:00
• 98233e7032 feat：导出 suzhuhong 2026-04-24 18:03:34 +08:00
• 7c5a2c858d Merge #109 into master from cc_20260420_export 正新 2026-04-24 09:44:31 +00:00
• d885635728 fix:装修验收调整 可以先装修验收 再加盟商验收 suzhuhong 2026-04-23 14:35:57 +08:00
• 0fbbc860f6 fix:SHOP_SUB_STAGE_STATUS_91 suzhuhong 2026-04-23 14:10:15 +08:00
• 4cafc87961 Merge branch 'cc_20260422_feeItemId' suzhuhong 2026-04-23 10:46:31 +08:00
• cb1da9a26f fix:关联分账单 suzhuhong 2026-04-23 10:46:02 +08:00
• 18d5e9c3dd Merge #108 into master from cc_20260422_feeItemId 正新 2026-04-22 10:49:03 +00:00
• 95e6400fa2 fix:调增的时候校验 suzhuhong 2026-04-22 18:48:38 +08:00
• 45766399fd Merge #107 into master from cc_20260422_feeItemId 正新 2026-04-22 10:32:23 +00:00
• 11cfdf5b90 fix:调增的时候校验 suzhuhong 2026-04-22 18:31:59 +08:00
• e34ca3bdfe Merge remote-tracking branch 'origin/master' suzhuhong 2026-04-22 18:14:25 +08:00
• 20c09f49d6 fix:去掉流水号不能为空 suzhuhong 2026-04-22 18:13:49 +08:00
• e9f37eb71a Merge #106 into master from cc_20260422_feeItemId 正新 2026-04-22 09:42:12 +00:00
• 717d4513ee fix:垃圾代码删除 suzhuhong 2026-04-22 17:41:28 +08:00
• e6797ce3ff Merge #105 into master from cc_20260422_feeItemId 正新 2026-04-22 09:29:26 +00:00
• f06519532e fix:splitType 传入 suzhuhong 2026-04-22 17:27:15 +08:00
• fca198a835 fix:费用类型feetId suzhuhong 2026-04-22 17:12:02 +08:00
• 34d95a3e4d Merge remote-tracking branch 'origin/master' suzhuhong 2026-04-22 16:02:04 +08:00
• 106f4bef46 fix:费用类型feetId suzhuhong 2026-04-22 16:01:39 +08:00
• 7cc4f7e1fa Merge #104 into master from cc_20260422_zhuangxiu 正新 2026-04-22 07:50:17 +00:00
• 66ab8dc975 fix:redis 执行异常 suzhuhong 2026-04-22 15:49:25 +08:00
• 78ef7e9440 fix:装修 红圈通回调调整 解除强制限制 suzhuhong 2026-04-22 11:11:25 +08:00
• a1da6ca445 feat:密码 suzhuhong 2026-04-21 19:31:07 +08:00
• 2d22aca884 feat:费用类型 suzhuhong 2026-04-21 19:20:36 +08:00
• 46937eacc7 feat:费用类型 suzhuhong 2026-04-21 17:37:41 +08:00
• 45664ddb42 feat:费用类型 suzhuhong 2026-04-21 17:35:35 +08:00
• 7c64c5d3d5 feat:费用类型 suzhuhong 2026-04-21 17:28:34 +08:00
• acd1323afa Merge branch 'cc_20260415_trans' suzhuhong 2026-04-20 16:43:02 +08:00
• cc0659157d feat:提示修改 suzhuhong 2026-04-20 10:14:06 +08:00
• 39d6b0662b Merge branch 'master' into cc_20260415_trans suzhuhong 2026-04-17 16:59:14 +08:00
• 824ef3f90a feat:提示修改 suzhuhong 2026-04-17 16:58:59 +08:00
• 8c4f55ab20 Merge #102 into master from cc_20260414_invoice 王非凡 2026-04-17 08:53:50 +00:00
• 7102127358 Merge #103 into master from cc_20250415_fix 正新 2026-04-17 08:50:38 +00:00
• fd1584f3e0 feat:分账门店映射 suzhuhong 2026-04-17 16:11:14 +08:00
• 2caabe3fe1 feat:分账门店映射 suzhuhong 2026-04-17 16:03:56 +08:00
• a884919d13 feat:分账处理 suzhuhong 2026-04-17 13:41:57 +08:00
• 5ccfbc96d7 feat:分账 suzhuhong 2026-04-16 18:25:22 +08:00
• d90f8eb2a8 feat:独立分账 suzhuhong 2026-04-16 11:03:52 +08:00
• 33f47db7e7 Merge branch 'master' into cc_20260415_trans suzhuhong 2026-04-16 09:50:00 +08:00
• 26257cf6ec Merge branch 'master' into cc_20260415_trans suzhuhong 2026-04-16 09:49:19 +08:00
• edfda87f92 Merge #101 into master from cc_20250415_fix 正新 2026-04-16 01:45:19 +00:00
• 4633d8dc80 Merge #100 into master from cc_0260415_fix 正新 2026-04-15 10:03:11 +00:00