 18338781771
|
106add4ecc
|
Merge branch 'feature/user0812' into develop_bm
# Conflicts:
# app/admin/service/UserService.php
# config/route.php
|
2025-08-13 09:51:26 +08:00 |
|
|
18338781771
|
67861532ec
|
后台公海列表，详情跟进、重置密码
|
2025-08-13 09:16:02 +08:00 |
|
 mzl92
|
c59758f03c
|
修改角色验证器
|
2025-08-13 08:49:09 +08:00 |
|
|
mzl92
|
855a701675
|
Merge branch 'master' into develop
|
2025-08-12 19:45:24 +08:00 |
|
|
mzl92
|
a5976af451
|
ts
|
2025-08-12 19:44:58 +08:00 |
|
 chenlan
|
15c089e0aa
|
ts
|
2025-08-12 19:03:37 +08:00 |
|
 mzl@hnxinyouhe.com
|
8333517465
|
Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev
|
2025-08-12 15:27:39 +08:00 |
|
|
mzl@hnxinyouhe.com
|
360aeec0e1
|
新增后台
|
2025-08-12 15:26:17 +08:00 |
|
|
18338781771
|
9c19cca671
|
组员用户
|
2025-08-12 13:53:48 +08:00 |
|
|
mzl92
|
55dea2dae2
|
Merge branch 'develop' into feature/mzl_dev
|
2025-08-12 11:23:15 +08:00 |
|
|
mzl92
|
f72a5def3e
|
ts
|
2025-08-12 10:44:51 +08:00 |
|
|
mzl@hnxinyouhe.com
|
20239dfb6f
|
增加后台基础功能，调整前端菜单返回
|
2025-08-11 20:09:28 +08:00 |
|
|
mzl@hnxinyouhe.com
|
3537d2fc3c
|
edit inquiry
|
2025-08-06 18:57:09 +08:00 |
|
|
mzl92
|
7187731dc2
|
ts
|
2025-08-05 11:33:57 +08:00 |
|
|
mzl92
|
f39b0ee63f
|
Merge branch 'feature/mzl_dev'
# Conflicts:
# app/common/utils/email/Emails.php
|
2025-08-05 10:05:16 +08:00 |
|
|
mzl92
|
3177e35524
|
edit email config
|
2025-08-05 09:00:36 +08:00 |
|
|
mzl92
|
a315ad33f1
|
Merge branch 'feature/mzl_dev'
# Conflicts:
# app/command/TbCommand.php
# app/common/utils/email/Emails.php
# app/controller/IndexController.php
# app/functions.php
|
2025-08-04 18:11:44 +08:00 |
|
|
mzl92
|
ea3914a3d6
|
ts
|
2025-08-04 14:43:22 +08:00 |
|
|
mzl92
|
b2d4119e46
|
Merge branch 'feature/mzl_dev'
|
2025-08-04 14:03:57 +08:00 |
|
|
mzl92
|
e10d167aec
|
ts
|
2025-07-31 10:34:15 +08:00 |
|
|
mzl92
|
3a63b714c0
|
修正绕过系统检查
|
2025-07-30 18:40:49 +08:00 |
|
|
mzl92
|
0ad2bf162c
|
修改飞书消息配置
|
2025-07-29 15:10:44 +08:00 |
|
|
mzl92
|
1a03b07f45
|
修改飞书应用信息
|
2025-07-29 14:06:57 +08:00 |
|
|
mzl92
|
7eeb1b6e1f
|
修改发送消息应用
|
2025-07-29 12:03:16 +08:00 |
|
|
mzl92
|
21b2851037
|
Merge branch 'develop'
# Conflicts:
# app/common/logic/PermLogic.php
|
2025-07-29 11:13:54 +08:00 |
|
|
mzl92
|
1f602a690b
|
Merge branch 'develop'
# Conflicts:
# app/common/controller/NotifyController.php
# app/common/service/UserService.php
# app/crm/service/CustomerService.php
# config/constants/Constants.php
|
2025-07-29 10:24:10 +08:00 |
|
|
mzl92
|
d74b374198
|
Merge branch 'develop'
|
2025-07-29 09:00:04 +08:00 |
|
|
mzl92
|
a57fb6132c
|
调整菜单url
|
2025-07-21 14:50:16 +08:00 |
|
|
mzl92
|
84cb69f9fe
|
调整菜单占位url
|
2025-07-17 14:49:55 +08:00 |
|
|
mzl92
|
85861240c3
|
Merge branch 'develop'
# Conflicts:
# app/common/logic/PermLogic.php
|
2025-07-14 19:01:42 +08:00 |
|
|
mzl92
|
bf5339724a
|
Merge branch 'develop'
# Conflicts:
# app/common/logic/PermLogic.php
|
2025-07-14 18:55:59 +08:00 |
|
|
mzl92
|
f915fd77a1
|
Merge commit '25e33cbbcf6d6b965148fc9da466cbfba4e9f73e'
|
2025-07-14 14:24:03 +08:00 |
|
|
mzl92
|
72878f49ea
|
Merge commit 'acd428f57bceb73ddc770cc6b59f8be7a237af90'
|
2025-07-14 10:08:29 +08:00 |
|
|
mzl92
|
925c5501f7
|
Merge branch 'develop'
|
2025-07-11 18:01:23 +08:00 |
|
|
ylyg5690
|
5289483a8a
|
first push
|
2025-07-01 19:39:13 +08:00 |
|