Commit Graph

3562 Commits

Author SHA1 Message Date
shuo.wang
cd3d0f2934 fix 2025-05-07 17:08:33 +08:00
shuo.wang
8462f1d41c fix 2025-05-07 17:05:56 +08:00
shuo.wang
9e91ab28ec fix 2025-05-07 17:01:12 +08:00
shuo.wang
87e0af9448 fix 2025-05-07 16:53:33 +08:00
shuo.wang
de80b0779f fix 2025-05-07 15:56:17 +08:00
shuo.wang
1bf23829a9 fix 2025-05-07 15:42:11 +08:00
shuo.wang
fd9227c355 fix 2025-05-07 15:32:30 +08:00
shuo.wang
886eaf6b16 fix 测量阶段和设计阶段待办 2025-05-07 15:02:10 +08:00
shuo.wang
f6ff88470c fix 测量阶段和设计阶段待办 2025-05-07 14:53:54 +08:00
苏竹红
64ccf21ee1 Merge branch 'cc_20250506' into 'master'
Cc 20250506

See merge request hangzhou/java/custom_zxjp!69
2025-05-06 11:13:36 +00:00
shuo.wang
434b9ff6f8 fix 开店管理增加合同签约,门店编码trim 修复导出字段没值 2025-05-06 18:43:00 +08:00
shuo.wang
9256c48b01 fix 开店管理增加合同签约,门店编码trim 修复导出字段没值 2025-05-06 18:39:47 +08:00
shuo.wang
d64f99b568 fix 开店管理增加合同签约,门店编码trim 修复导出字段没值 2025-05-06 18:36:32 +08:00
shuo.wang
c5bcfee942 fix 开店管理增加合同签约,门店编码trim 修复导出字段没值 2025-05-06 17:18:54 +08:00
苏竹红
70c114db24 feat:审核 2025-05-05 21:06:35 +08:00
苏竹红
3fcaee3853 feat:第二密码 2025-05-05 20:57:24 +08:00
苏竹红
9e7146e39d Merge branch 'cc_20250428_dateHandler' into 'master'
Cc 20250428 date handler

See merge request hangzhou/java/custom_zxjp!68
2025-04-30 11:38:05 +00:00
shuo.wang
0be5ce127e fix 2025-04-30 17:35:57 +08:00
shuo.wang
04e0cc4f08 fix 2025-04-30 16:28:00 +08:00
shuo.wang
a19f83434c fix 2025-04-30 15:53:41 +08:00
shuo.wang
ec046b09e0 fix 2025-04-30 15:26:12 +08:00
shuo.wang
bbd03472d9 导出放开限制,测量阶段通知 2025-04-30 15:15:07 +08:00
王晓鹏
ea28350997 Merge branch 'cc_20250428_dateHandler' into 'master'
Cc 20250428 date handler

See merge request hangzhou/java/custom_zxjp!67
2025-04-29 12:15:58 +00:00
shuo.wang
921447d672 fix 2025-04-29 20:13:43 +08:00
shuo.wang
fcc86e38f0 导出加字段 2025-04-29 19:23:31 +08:00
shuo.wang
a1c50bfe98 feat:密码数据处理,验签排除空字符串,导出接口 2025-04-29 16:32:47 +08:00
shuo.wang
bd80c5477f feat:密码数据处理,验签排除空字符串,导出接口 2025-04-28 22:24:49 +08:00
苏竹红
6da34ba779 Merge branch 'feat-measurement-20250423' into 'master'
Feat measurement 20250423

See merge request hangzhou/java/custom_zxjp!66
2025-04-25 14:29:18 +00:00
苏竹红
167b4367b6 feat:取消发票上传通知 2025-04-25 17:51:28 +08:00
ryan.xu
9a946e17a8 Merge remote-tracking branch 'origin/feat-measurement-20250423' into feat-measurement-20250423 2025-04-25 17:23:23 +08:00
ryan.xu
f26e519f6e feat: 报价员阶段只能看到自己 2025-04-25 17:23:05 +08:00
苏竹红
ebd236629b feat:数据处理 2025-04-25 16:53:23 +08:00
ryan.xu
683ffec2d7 feat: 测量阶段代办按照职位查询数据 2025-04-25 14:43:28 +08:00
ryan.xu
969e27bedf feat: 设计代办事项按照职位查看数据 2025-04-25 12:25:56 +08:00
ryan.xu
3eef33cbad feat: 设计代办事项查询问题 2025-04-25 11:19:29 +08:00
ryan.xu
02743a136c feat: 设计组组长默认值赋值 2025-04-24 17:07:43 +08:00
ryan.xu
ebaabf8231 feat: redis配置还原 2025-04-24 10:29:43 +08:00
ryan.xu
3edcd3b4a2 feat: 装修测量阶段+设计阶段流程优化 2025-04-24 09:36:12 +08:00
苏竹红
c75523cd80 Merge branch 'cc_20250422' into 'master'
Cc 20250422

See merge request hangzhou/java/custom_zxjp!65
2025-04-22 13:56:01 +00:00
shuo.wang
d0cef8a4a8 增加校验 2025-04-22 21:52:19 +08:00
shuo.wang
73717e669a 数据处理 2025-04-22 19:13:30 +08:00
shuo.wang
8de500a42d fix 2025-04-22 14:40:13 +08:00
shuo.wang
08bf1c0203 门店类型同步接口优化 2025-04-22 14:34:26 +08:00
shuo.wang
51aa3c73a7 加盟合同优化 2025-04-22 14:05:45 +08:00
shuo.wang
574e0662e1 加盟合同优化 2025-04-22 11:45:12 +08:00
苏竹红
d39ee0f628 Merge branch 'cc_2025_0421' into 'master'
Cc 2025 0421

See merge request hangzhou/java/custom_zxjp!64
2025-04-21 14:18:30 +00:00
苏竹红
036bea60ab Merge branch 'master' into cc_2025_0421 2025-04-21 22:17:56 +08:00
苏竹红
404afbaa2e feat:bug 2025-04-21 22:04:28 +08:00
shuo.wang
ef480b1691 fix 2025-04-21 21:44:37 +08:00
shuo.wang
ec6b526e81 Merge branch 'master' into cc_2025_0421 2025-04-21 21:43:56 +08:00