Commit Graph

361 Commits

Author SHA1 Message Date
zhangkaihuai
de83cc57da Merge pull request '更新 docker.sh' (#130) from zhangkaihuai-patch-1 into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/130
2024-10-03 09:03:25 +00:00
zhangkaihuai
c32232a388 更新 docker.sh 2024-10-03 09:03:18 +00:00
5c7a82ce0c Merge pull request 'fix : 修复角色分配用户单个添加时报错' (#129) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/129
2024-09-30 07:35:13 +00:00
f4542e9ca9 fix : 修复角色分配用户单个添加时报错 2024-09-30 15:34:45 +08:00
aa84769740 Merge pull request 'master' (#128) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/128
2024-09-30 07:29:17 +00:00
75be56f30b Merge pull request 'fix : 清空默认登录账号' (#127) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/127
2024-09-30 07:29:09 +00:00
64c86783be fix : 清空默认登录账号 2024-09-30 15:28:55 +08:00
a1860c4f01 Merge pull request 'master' (#126) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/126
2024-09-30 07:27:45 +00:00
8e6ab64ce7 Merge pull request 'fix : 修改登录默认账号' (#125) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/125
2024-09-30 07:27:31 +00:00
44e3679787 fix : 修改登录默认账号 2024-09-30 15:27:13 +08:00
8849e991b2 Merge pull request 'master' (#124) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/124
2024-09-28 14:56:48 +00:00
46d951be4a Merge pull request 'fix : 移除话术ID和敏感词ID' (#123) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/123
2024-09-28 14:56:28 +00:00
7b9d7ed741 fix : 移除话术ID和敏感词ID 2024-09-28 22:55:28 +08:00
e0ef98ef70 Merge pull request 'master' (#122) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/122
2024-09-28 12:40:04 +00:00
3ac16d6eda Merge pull request 'dd' (#121) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/121
2024-09-28 12:39:56 +00:00
6bdd2620ca feat : 添加参数配置中外部配置类型 2024-09-28 20:39:47 +08:00
f0fd5c543d fix : 修改所有工单时间格式 2024-09-28 20:39:21 +08:00
e59ca5d96c Merge pull request 'master' (#120) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/120
2024-09-28 12:24:12 +00:00
5bf8fbbed7 Merge pull request 'fix : 修改所有工单创建时间参数' (#119) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/119
2024-09-28 12:24:02 +00:00
75917c2e5b fix : 修改所有工单创建时间参数 2024-09-28 20:23:42 +08:00
e9e1d7669f Merge pull request 'master' (#118) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/118
2024-09-28 12:22:31 +00:00
1eb45c714e Merge pull request 'fix : 修改登录默认密码' (#117) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/117
2024-09-28 12:22:07 +00:00
26dcadc0c0 fix : 修改登录默认密码 2024-09-28 20:21:53 +08:00
springlog
a32651559f Merge pull request 'master' (#116) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/116
2024-09-27 11:22:29 +00:00
springlog
04a65335dd Merge pull request '更换wsrul' (#115) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/115
2024-09-27 11:21:23 +00:00
KindSeven
57b4adf408 更换wsrul 2024-09-27 19:21:20 +08:00
de43201cc3 Merge pull request 'master' (#114) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/114
2024-09-27 09:04:13 +00:00
b3cf22ec78 Merge pull request 'fix : 优化工单列表样式' (#113) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/113
2024-09-27 09:03:57 +00:00
08b33132da fix : 优化工单列表样式 2024-09-27 17:03:40 +08:00
springlog
7720295c0d Merge pull request 'master' (#112) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/112
2024-09-27 06:13:06 +00:00
springlog
afff92fb55 Merge pull request 'wxy' (#111) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/111
2024-09-27 06:12:49 +00:00
KindSeven
c3d602e585 fix:删除了历史工单工单状态搜索栏 2024-09-27 14:12:41 +08:00
KindSeven
459243bd80 Merge branch 'master' into wxy 2024-09-27 14:10:23 +08:00
springlog
6446df21be Merge pull request 'master' (#110) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/110
2024-09-26 17:33:29 +00:00
KindSeven
8f06f483ea Merge branch 'master' into wxy 2024-09-27 01:32:59 +08:00
springlog
f0c735e90d Merge pull request 'fix:修复了工单,工单详情,工作台的部分显示问题' (#109) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/109
2024-09-26 17:32:56 +00:00
springlog
7a404a7d3a Merge branch 'master' into wxy 2024-09-26 17:31:39 +00:00
KindSeven
19e2cece7c fix:修复了工单,工单详情,工作台的部分显示问题 2024-09-27 01:30:14 +08:00
springlog
501a64960c Merge pull request 'master' (#108) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/108
2024-09-25 12:13:25 +00:00
KindSeven
68f3d61974 fix:取消了console.log 2024-09-25 20:13:07 +08:00
springlog
6a2db2ee4c Merge pull request 'wxy' (#107) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/107
2024-09-25 12:13:06 +00:00
KindSeven
ad5354f046 fix:开启了修改密码处表单验证 2024-09-25 20:11:38 +08:00
KindSeven
03e57d8ee2 feat:对接了修改密码接口 2024-09-25 20:10:26 +08:00
f51fe7f903 Merge pull request 'master' (#106) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/106
2024-09-25 09:58:05 +00:00
aac2d52bcc Merge pull request 'fix : 优化通话记录框样式' (#105) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/105
2024-09-25 09:57:56 +00:00
b71c948854 fix : 优化通话记录框样式 2024-09-25 17:55:21 +08:00
46e5f80147 Merge pull request 'master' (#104) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/104
2024-09-25 05:50:36 +00:00
98384809b1 Merge pull request 'fix : 首页历史通话记录展示' (#103) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/103
2024-09-25 03:19:55 +00:00
34340136fb fix : 首页历史通话记录展示 2024-09-25 11:08:55 +08:00
springlog
bcacb3da43 Merge pull request 'master' (#102) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/102
2024-09-24 19:10:26 +00:00