Commit Graph

1898 Commits

Author SHA1 Message Date
weixiaobo@boe.com.cn
fb4bca77b3 左侧菜单影藏报表中心 2023-08-04 13:54:13 +08:00
weixiaobo@boe.com.cn
c2b08827fa 受众管理菜单控制 2023-08-01 16:49:39 +08:00
weixiaobo@boe.com.cn
f10b1c1fde 加固定受众餐单 2023-08-01 16:35:33 +08:00
yujicun
f419061cd5 Merge remote-tracking branch 'origin/user-modify' into cloud 2023-07-28 18:45:23 +08:00
yuping
f6e77b740c ---fix bug 2023-07-28 18:41:55 +08:00
yuping
7aab20177b ---fix bug 2023-07-28 18:31:06 +08:00
yujicun
ba2d86f470 Merge remote-tracking branch 'origin/user-modify' into cloud 2023-07-28 18:18:24 +08:00
yuping
8ffff197fa ---fix bug 2023-07-28 17:53:57 +08:00
yujicun
8fbc18a1dc Merge remote-tracking branch 'origin/user-modify' into cloud 2023-07-28 16:04:05 +08:00
yuping
9fde3a1ea2 ---fix bug 2023-07-28 13:50:06 +08:00
BOE\10867418
72495fb8f4 Merge branch 'dongwu-master' 2023-07-13 14:54:26 +08:00
yuping
bc4fb588b5 fix 课程二维码加随机数 2023-07-13 14:52:39 +08:00
yuping
692eabb474 fix bug 用户中心接口调整 2023-07-10 09:56:24 +08:00
yuping
be90a8b34e fix bug 用户中心接口调整 2023-07-08 11:14:37 +08:00
yuping
727a377afa 用户中心接口调整 2023-07-03 15:18:59 +08:00
yuping
0e8341f980 接口调整 2023-07-02 18:21:27 +08:00
U-BOE\ZXYJY017
7bbf0131af Merge remote-tracking branch 'dongwuMaster/master' 2023-06-28 18:49:33 +08:00
yuping
4e2ed3c456 --fix 持续时间为非必填 2023-06-27 14:26:18 +08:00
yuping
6dc25ee9f0 --fix 持续时间为非必填 2023-06-27 14:13:15 +08:00
yuping
16d4f9b4a6 --fix 持续时间为非必填 2023-06-27 14:08:46 +08:00
yuping
d00c5064e1 --fix bug 2023-06-13 11:35:46 +08:00
yuping
e84c448936 --fix bug 2023-06-13 09:41:07 +08:00
yuping
9f3bd4b29a ---fix bug 2023-06-08 17:42:16 +08:00
yuping
c574f0c55b ---fix bug 2023-06-08 17:38:33 +08:00
yuping
94a12c80b9 ---fix bug 2023-06-08 17:31:17 +08:00
yuping
ee87c00161 ---项目详情 2023-06-08 17:19:15 +08:00
yuping
914d9a09d1 ---项目详情 2023-06-08 17:16:19 +08:00
yuping
fe0e9f2651 --fix bug 2023-06-02 00:23:44 +08:00
yuping
4680d44799 --fix bug 2023-06-01 00:33:27 +08:00
yuping
e2b416234b --fix bug 2023-05-30 01:06:24 +08:00
yujicun
a4b99e9087 Merge remote-tracking branch 'origin/master' 2023-05-16 16:12:12 +08:00
yuping
66508ac933 --fix 评估导出 2023-05-16 15:37:13 +08:00
yujicun
2fca9815ea Merge remote-tracking branch 'origin/master' 2023-05-16 14:33:41 +08:00
yuping
24af0f7b29 --fix 去掉持续时间 2023-05-16 13:59:04 +08:00
yuping
ef83b3ef10 --fix bug 2023-05-15 00:43:18 +08:00
yuping
9416ae7158 --fix bug 2023-05-11 21:45:25 +08:00
BOE\10867418
71a35d829f Merge branch 'dongwu-master' 2023-04-17 15:11:35 +08:00
yuping
d284869a44 Merge branch 'develop' 2023-04-17 11:21:57 +08:00
yuping
2c08fe9c41 --fix bug 考试bug 2023-04-13 15:40:20 +08:00
zhangyc
6773745fd1 考试及格线不能为负数 2023-04-12 15:31:43 +08:00
BOE\10867418
f4552c5a6f 修改面包屑冲突 2023-04-11 16:57:34 +08:00
BOE\10867418
7b3149ffef Merge branch 'dev_m'
# Conflicts:
#	src/components/BreadCrumb.vue
2023-04-11 10:15:43 +08:00
BOE\10867418
1b78971e2d 更改导航 2023-04-11 09:26:38 +08:00
yuping
6d1861343c Merge branch 'develop'
# Conflicts:
#	src/App.vue
#	src/components/drawers/AddActive.vue
#	src/components/drawers/AddCase.vue
#	src/components/drawers/AddEval.vue
#	src/components/drawers/AddHomework.vue
#	src/components/drawers/AddInvist.vue
#	src/components/drawers/AddLive.vue
#	src/components/drawers/AddOnline.vue
#	src/components/drawers/AddProject.vue
#	src/components/drawers/AddRef.vue
#	src/components/drawers/AddTest.vue
#	src/components/vote/AddVote.vue
2023-04-10 16:41:53 +08:00
yuping
7990759b3f --fix bug 2023-04-10 12:03:09 +08:00
yuping
49c6e0756c --fix bug 2023-04-07 02:00:36 +08:00
yuping
cef42554e4 --fix bug 2023-04-06 16:49:27 +08:00
yuping
399339ae12 --fix bug 2023-04-06 16:07:58 +08:00
yuping
712425d71e --fix bug 2023-04-06 16:03:29 +08:00
yuping
bfcf84d3f5 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/drawers/project/ProjectOnlineManage.vue
2023-04-06 16:02:42 +08:00