Commit Graph

371 Commits

Author SHA1 Message Date
clay
73426259e7 Merge pull request '更新 docker.sh' (#80) from clay-patch-1 into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/80
2024-09-16 12:50:18 +00:00
clay
31e0349443 更新 docker.sh 2024-09-16 12:50:05 +00:00
50b61e83b8 Merge pull request 'master' (#79) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/79
2024-09-16 07:11:10 +00:00
383b9c6141 Merge pull request 'fix : 修复pointTag字体颜色' (#78) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/78
2024-09-16 07:11:01 +00:00
5882b0aff3 fix : 修复pointTag字体颜色 2024-09-16 15:10:45 +08:00
1dbea2473b Merge pull request 'master' (#77) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/77
2024-09-16 06:49:47 +00:00
ec0229df53 Merge pull request 'dd' (#76) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/76
2024-09-16 06:49:38 +00:00
2d4764d34a feat : 敏感词管理 2024-09-16 14:49:16 +08:00
4192064e3f fix : 修改命名规范 2024-09-16 14:34:24 +08:00
3882fa4ed5 feat : 话术管理 2024-09-16 14:33:52 +08:00
947798609c Merge pull request 'master' (#75) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/75
2024-09-16 03:22:44 +00:00
76be77c92b Merge pull request 'fix : 修复通讯录手机号码校验' (#74) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/74
2024-09-16 03:22:31 +00:00
49e379cc22 fix : 修复通讯录手机号码校验 2024-09-16 11:22:08 +08:00
springlog
5ee7666af7 Merge pull request 'master' (#73) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/73
2024-09-15 19:45:14 +00:00
springlog
88ef22f88e Merge pull request 'feat:增加了当已是关单状态时进行关单则不能关单的提示' (#72) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/72
2024-09-15 19:44:41 +00:00
KindSeven
371c332f3c feat:增加了当已是关单状态时进行关单则不能关单的提示 2024-09-16 03:43:51 +08:00
ca2e8c379c Merge pull request 'master' (#71) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/71
2024-09-15 19:22:46 +00:00
49c9af9ce3 Merge pull request 'feat : 通讯录批量删除' (#70) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/70
2024-09-15 19:22:24 +00:00
2b9844f191 feat : 通讯录批量删除 2024-09-16 03:22:08 +08:00
springlog
f87f95a329 Merge pull request 'wxy' (#69) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/69
2024-09-15 19:20:38 +00:00
KindSeven
b7bec91182 feat:完成了详细中电话栏的样式 2024-09-16 03:19:45 +08:00
KindSeven
33ca57c921 feat:增加了详情页面电话栏内排序显示 2024-09-16 02:48:06 +08:00
KindSeven
9b12fb5176 feat:对详情中的日期进行了排序 2024-09-16 02:44:13 +08:00
b1550815cf Merge pull request 'master' (#68) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/68
2024-09-15 18:44:09 +00:00
738c46d023 Merge pull request 'fix : 修复pointTag组件' (#67) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/67
2024-09-15 18:39:59 +00:00
8d55b3b97c fix : 修复pointTag组件 2024-09-16 02:39:46 +08:00
springlog
34792c6c7b Merge pull request 'wxy' (#66) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/66
2024-09-15 17:53:36 +00:00
KindSeven
77c6f66753 完成了工单详情的渲染 2024-09-16 01:51:42 +08:00
KindSeven
366e7ca0e1 wxy merge master 2024-09-16 01:50:17 +08:00
KindSeven
884285fdd2 feat:完成了详情页的实时数据渲染 2024-09-16 01:47:24 +08:00
springlog
e3c15d0368 Merge pull request 'fix:修复了工单传参列表里的参数' (#65) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/65
2024-09-15 17:05:52 +00:00
springlog
fc2454170f Merge branch 'master' into wxy 2024-09-15 17:05:44 +00:00
KindSeven
16d9d6ebac fix:修复了工单传参列表里的参数 2024-09-16 01:04:37 +08:00
501db7bf03 Merge pull request 'master' (#64) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/64
2024-09-15 16:53:30 +00:00
1263db0ec4 Merge pull request 'dd' (#63) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/63
2024-09-15 16:53:21 +00:00
8bdd312235 fix : 注释工作台模拟数据 2024-09-16 00:53:10 +08:00
2e5e3e39e0 fix : 注释npm install 2024-09-16 00:51:37 +08:00
2c7bdb5a74 Merge pull request 'master' (#62) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/62
2024-09-15 16:49:15 +00:00
0c2c2a7e79 Merge pull request 'feat : 工作台实时通话记录socket初步对接' (#61) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/61
2024-09-15 16:49:08 +00:00
ecba5f4da1 feat : 工作台实时通话记录socket初步对接 2024-09-16 00:48:57 +08:00
173562c9d2 Merge pull request 'master' (#60) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/60
2024-09-15 15:01:56 +00:00
769e21471a Merge pull request 'fix : 修复组件引入bug' (#59) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/59
2024-09-15 15:01:48 +00:00
78ba7aa69d fix : 修复组件引入bug 2024-09-15 23:01:38 +08:00
5076c5be37 Merge pull request 'master' (#58) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/58
2024-09-15 14:59:28 +00:00
dc802bc199 Merge pull request 'feat : 通讯录管理' (#57) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/57
2024-09-15 14:59:02 +00:00
1fcaddb5d5 feat : 通讯录管理 2024-09-15 22:58:46 +08:00
springlog
c38ed50d8b Merge pull request 'wxy' (#56) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/56
2024-09-15 14:58:08 +00:00
KindSeven
704462b2a1 复原了删除vite文件 2024-09-15 22:50:48 +08:00
KindSeven
78f86a9211 修复merge 2024-09-15 22:39:14 +08:00
KindSeven
307ea2282a update .gitignore 2024-09-15 22:30:10 +08:00