Commit Graph

92 Commits

Author SHA1 Message Date
18338781771 adf617e18b 账户描述 2025-09-17 15:41:59 +08:00
18338781771 3ef45a24c7 品牌推荐 2025-09-17 14:15:09 +08:00
mzl92 62c32d25ff Merge branch 'develop' 2025-09-16 10:53:57 +08:00
18338781771 09502dc503 Merge branch 'feature/upload' into develop 2025-09-04 14:56:16 +08:00
mzl92 dcabbb697a Merge branch 'develop' into feature/mzl_dev 2025-09-04 10:27:19 +08:00
18338781771 b7abe60d71 上传 2025-09-03 11:03:22 +08:00
18338781771 152ce9a75f 港口场景筛选 2025-09-02 18:04:09 +08:00
mzl92 6a1ab1f5c3 增加备货单 2025-09-02 17:22:56 +08:00
18338781771 a3d39feace 货币下拉 2025-09-02 17:14:11 +08:00
mzl92 476921e6b8 备货单 2025-09-02 09:36:37 +08:00
mzl92 b3d8029e6d Merge branch 'develop_bm' into feature/mzl_dev
# Conflicts:
#	app/controller/IndexController.php
#	config/route.php
2025-09-01 14:06:34 +08:00
mzl92 847303a8fa 汽车信息基础库 2025-09-01 10:08:51 +08:00
mzl92 11165fcfb9 Merge commit 'ed96e0f8589042fb8e9d6cfee713c5150612bb34' 2025-08-22 18:16:13 +08:00
mzl92 68d42584bd Merge branch 'develop' into feature/mzl_dev 2025-08-22 16:41:18 +08:00
mzl92 c1de258ce2 增加后台消息通知管理 2025-08-21 15:47:05 +08:00
mzl92 d41fc55e61 修正新员工在没有企业邮箱时,不能创建的问题 2025-08-21 14:31:37 +08:00
mzl92 9f96b8d625 消息推送 2025-08-20 18:12:07 +08:00
mzl92 39e840bba8 Merge branch 'develop' 2025-08-14 20:08:57 +08:00
18338781771 377407eb7d Merge branch 'develop' into feature/user0812 2025-08-14 11:15:42 +08:00
chenlan 962f891898 补充权限代码块儿注释说明 2025-08-14 11:06:54 +08:00
18338781771 f326665716 Merge branch 'develop' into feature/user0812
# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
2025-08-14 10:09:56 +08:00
mzl@hnxinyouhe.com c4249dd018 修正误删代码 2025-08-13 19:37:52 +08:00
mzl@hnxinyouhe.com 2696f52db2 增加注册时根据公司进行自动授权&&调整资源列表返回 2025-08-13 15:18:36 +08:00
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
mzl@hnxinyouhe.com 360aeec0e1 新增后台 2025-08-12 15:26:17 +08:00
18338781771 9c19cca671 组员用户 2025-08-12 13:53:48 +08:00
mzl@hnxinyouhe.com 20239dfb6f 增加后台基础功能,调整前端菜单返回 2025-08-11 20:09:28 +08:00
mzl92 7187731dc2 ts 2025-08-05 11:33:57 +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 21b2851037 Merge branch 'develop'
# Conflicts:
#	app/common/logic/PermLogic.php
2025-07-29 11:13:54 +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 925c5501f7 Merge branch 'develop' 2025-07-11 18:01:23 +08:00
ylyg5690 5289483a8a first push 2025-07-01 19:39:13 +08:00