 caoqianming
|
91b67940e2
|
fix: task2 start 不限制task2 的状态
|
2023-06-25 14:54:34 +08:00 |
|
caoqianming
|
0840479e39
|
feat: task2do增加删除功能
|
2023-06-25 14:47:05 +08:00 |
|
caoqianming
|
66cfee6e3d
|
feat: pgoaldept支持多条件查询
|
2023-06-19 10:04:04 +08:00 |
|
caoqianming
|
38e337fce7
|
fix: 日常监督少统计num_acc字段
|
2023-06-16 13:46:16 +08:00 |
|
caoqianming
|
3863e8c83f
|
fix: 导入时需要统计执行情况
|
2023-06-16 13:37:49 +08:00 |
|
caoqianming
|
9ebdd24015
|
fix: 修改导入task2do的bug
|
2023-06-15 14:39:18 +08:00 |
|
caoqianming
|
154886e2e7
|
fix: pgoal_file bug
|
2023-06-06 14:52:45 +08:00 |
|
caoqianming
|
ea0ce8f752
|
feat: goal_files_ 返回详细信息
|
2023-06-06 14:46:39 +08:00 |
|
caoqianming
|
9ff19a004f
|
fix: task2已关闭不可编辑
|
2023-06-06 14:43:42 +08:00 |
|
caoqianming
|
55d172588a
|
fix: task2 start bug
|
2023-06-06 14:27:40 +08:00 |
|
caoqianming
|
ea5f4c0a29
|
fix: 修改字段
|
2023-06-06 10:44:06 +08:00 |
|
caoqianming
|
7ce6fecb35
|
feat: task2增加截止日期
|
2023-06-05 17:03:33 +08:00 |
|
caoqianming
|
c86e0a77e9
|
feat: 去除goal_o_file 无用字段2
|
2023-06-05 17:00:39 +08:00 |
|
caoqianming
|
a07d0c034d
|
feat: 去除goal_o_file 无用字段
|
2023-06-05 15:44:55 +08:00 |
|
caoqianming
|
4bf80699bd
|
fix: pgoal dept update 时也进行计算
|
2023-06-05 15:39:18 +08:00 |
|
caoqianming
|
b6ca08a3f0
|
refector: norecord优化
|
2023-06-01 14:11:22 +08:00 |
|
caoqianming
|
2595a51390
|
fix: no record bug
|
2023-06-01 14:03:12 +08:00 |
|
caoqianming
|
a7d2c4f8c4
|
feat: norecord时num_pt_10 也为0
|
2023-06-01 13:45:41 +08:00 |
|
caoqianming
|
9cbd7ff12e
|
feat: 增加统计字段完成
|
2023-05-31 16:38:49 +08:00 |
|
caoqianming
|
1d31f80c92
|
feat: 增加统计字段
|
2023-05-31 16:31:43 +08:00 |
|
caoqianming
|
46e9607942
|
feat: 增加commonadmodel
|
2023-05-30 14:46:52 +08:00 |
|
caoqianming
|
ca5f75177b
|
feat: pgoaldept增加task2do筛选条件
|
2023-05-29 17:28:27 +08:00 |
|
caoqianming
|
2c168411de
|
fix: 年度基础目标使用物理删除
|
2023-05-29 17:08:28 +08:00 |
|
caoqianming
|
610e7850d3
|
fix: countnum_task2do_field bug
|
2023-05-29 15:56:55 +08:00 |
|
caoqianming
|
10feb5493a
|
fix: 创建pt bug
|
2023-05-29 15:46:40 +08:00 |
|
caoqianming
|
1c9e7a8769
|
fix: 查询条件有误
|
2023-05-29 15:09:03 +08:00 |
|
caoqianming
|
d533b1c93c
|
feat: 增加筛选条件
|
2023-05-29 14:42:56 +08:00 |
|
caoqianming
|
4f58ed67e0
|
feat: 表格导入接口完成
|
2023-05-29 13:47:01 +08:00 |
|
caoqianming
|
45e95ad014
|
refector: 同步数据库
|
2023-05-29 12:07:07 +08:00 |
|
caoqianming
|
459caa7667
|
fix: 修改字段名
|
2023-05-29 08:39:18 +08:00 |
|
caoqianming
|
89b90f8e66
|
fix: save_num bug
|
2023-05-26 17:08:43 +08:00 |
|
caoqianming
|
e8dbb8df24
|
fix: goal_value_a可为空值
|
2023-05-26 16:47:17 +08:00 |
|
caoqianming
|
5069d1b7fe
|
fix: pgoaldept create validate bug
|
2023-05-26 16:42:49 +08:00 |
|
caoqianming
|
43dc1d176e
|
fix: pgoaldept create validate bug
|
2023-05-26 16:36:51 +08:00 |
|
caoqianming
|
3b95625d04
|
feat: 返回goal_o_file_
|
2023-05-25 16:04:00 +08:00 |
|
caoqianming
|
91ac2f29f9
|
refector: 更新库版本.修改bug
|
2023-05-23 14:55:24 +08:00 |
|
caoqianming
|
90900bf71e
|
fix: task2 start bug
|
2023-05-23 14:17:50 +08:00 |
|
caoqianming
|
f41a8292d6
|
fix: 权限配置错误
|
2023-05-23 14:13:25 +08:00 |
|
caoqianming
|
f9f3a256b8
|
fix: task2 update pop 不报错
|
2023-05-22 17:15:27 +08:00 |
|
caoqianming
|
36b608197e
|
fix: task2do my 错误
|
2023-05-22 16:35:57 +08:00 |
|
caoqianming
|
c9c9d136a1
|
fix: 更新数据库task2 default
|
2023-05-22 15:20:24 +08:00 |
|
caoqianming
|
cbf274cc7c
|
fix: 添加保存num_issue接口
|
2023-05-17 17:03:24 +08:00 |
|
caoqianming
|
c6fd6b93ab
|
feat: 完成大部门新日常监督接口
|
2023-05-17 14:36:32 +08:00 |
|
caoqianming
|
bffb1811df
|
feat: 检查条款类型增加
|
2023-05-11 10:03:55 +08:00 |
|
caoqianming
|
3287200a55
|
fix: import_cma2不事先删除
|
2023-04-07 12:13:42 +08:00 |
|
caoqianming
|
fae6fbde88
|
fix: 导入时使用get('')结构，并先删除文件夹
|
2023-04-07 10:40:36 +08:00 |
|
caoqianming
|
2dfaa6a273
|
变更taction model 为commonamodel
|
2023-03-08 12:11:52 +08:00 |
|
caoqianming
|
fce452e41e
|
变更taction model 为commonamodel
|
2023-03-08 12:11:26 +08:00 |
|
caoqianming
|
fd1aa62cb0
|
TAction关联检测报告
|
2023-03-07 14:20:20 +08:00 |
|
caoqianming
|
7c565f9bb6
|
Taction 增加 type 字段
|
2023-03-07 13:57:16 +08:00 |
|
caoqianming
|
a6ae4bd004
|
批量删除所属公司2
|
2023-03-07 13:22:35 +08:00 |
|
caoqianming
|
818021df6e
|
批量删除所属公司
|
2023-03-07 11:22:50 +08:00 |
|
caoqianming
|
51dcf1191b
|
创建新日常监督tr和ta表
|
2023-03-03 11:02:16 +08:00 |
|
caoqianming
|
b26f2b75f8
|
观看统计bug
|
2022-12-21 10:46:13 +08:00 |
|
caoqianming
|
949fd2c3a6
|
观看统计bug
|
2022-12-21 10:37:06 +08:00 |
|
caoqianming
|
aa2c4d8d10
|
完成播放接口修改
|
2022-12-05 14:36:21 +08:00 |
|
caoqianming
|
fc79e0b782
|
观看人数bug
|
2022-12-05 14:15:49 +08:00 |
|
caoqianming
|
e3f6ed80ac
|
排序desc修改
|
2022-12-05 14:08:17 +08:00 |
|
caoqianming
|
4895d0a334
|
考试增加是否公开字段
|
2022-11-22 10:15:07 +08:00 |
|
caoqianming
|
ff32c4e763
|
bug修改
|
2022-11-18 13:29:32 +08:00 |
|
caoqianming
|
9c7734820a
|
统计sql 完成
|
2022-11-17 18:17:53 +08:00 |
|
caoqianming
|
6d3e304359
|
增加category big
|
2022-11-17 09:50:51 +08:00 |
|
caoqianming
|
870587e878
|
ViewItem update
|
2022-11-17 09:04:43 +08:00 |
|
caoqianming
|
f230990f2a
|
修改bug
|
2022-11-16 17:11:42 +08:00 |
|
caoqianming
|
666ed5968a
|
视频统计修改
|
2022-11-16 16:45:54 +08:00 |
|
caoqianming
|
e12a815cdd
|
答卷返回顺序有误
|
2022-11-15 15:32:10 +08:00 |
|
caoqianming
|
e22aed286b
|
考试记录权限
|
2022-11-14 15:56:27 +08:00 |
|
caoqianming
|
f16b7e7b45
|
考试记录详情接口
|
2022-11-14 15:46:57 +08:00 |
|
caoqianming
|
10104b88f6
|
判卷bug2
|
2022-11-14 14:33:53 +08:00 |
|
caoqianming
|
4f1d695e5f
|
判卷bug
|
2022-11-14 14:31:12 +08:00 |
|
caoqianming
|
692c096f8d
|
er create_by bug
|
2022-11-14 14:08:39 +08:00 |
|
caoqianming
|
f3b52511b5
|
答题bug修改
|
2022-11-14 11:13:47 +08:00 |
|
caoqianming
|
086c701cfa
|
增加coustommixin
|
2022-11-11 16:42:53 +08:00 |
|
caoqianming
|
238e6988f4
|
题目列表返回questioncat_name
|
2022-11-11 16:22:01 +08:00 |
|
caoqianming
|
7d63942616
|
30分钟内播放算播放一次
|
2022-11-11 15:44:51 +08:00 |
|
caoqianming
|
39a8eb9740
|
serializer 修改
|
2022-11-08 16:19:54 +08:00 |
|
caoqianming
|
701784fb53
|
考试api基本完成3
|
2022-11-08 13:20:05 +08:00 |
|
caoqianming
|
2c643ca269
|
考试api基本完成2
|
2022-11-08 10:06:40 +08:00 |
|
caoqianming
|
d5b9e183c1
|
model更新
|
2022-11-08 09:18:54 +08:00 |
|
caoqianming
|
295d5f886d
|
考试api基本完成
|
2022-11-07 18:16:48 +08:00 |
|
caoqianming
|
d45afb9861
|
paper 字段修改
|
2022-11-04 17:14:49 +08:00 |
|
caoqianming
|
851e9291ab
|
cma_search 修改
|
2022-11-04 17:11:50 +08:00 |
|
caoqianming
|
47deee8567
|
增加paper表等
|
2022-11-03 17:40:40 +08:00 |
|
caoqianming
|
b4ea42de83
|
qtask 可看下级
|
2022-11-02 15:59:19 +08:00 |
|
caoqianming
|
adf5957f70
|
qtask 可看下级
|
2022-11-02 15:50:38 +08:00 |
|
caoqianming
|
81d99a168c
|
qtask 可看下级
|
2022-11-02 15:33:17 +08:00 |
|
caoqianming
|
5c60627313
|
该视频的本人观看信息bug
|
2022-10-31 14:22:20 +08:00 |
|
caoqianming
|
cc30c9babf
|
创建题目分类/题目表
|
2022-10-31 10:14:44 +08:00 |
|
caoqianming
|
d819dccc08
|
统计观看时长/登录日志
|
2022-10-12 16:38:30 +08:00 |
曹前明
|
7b956f5ef5
|
qorg bug
|
2022-06-30 10:11:41 +08:00 |
|
曹前明
|
0b285d34b2
|
qaction 统计错误
|
2022-06-30 09:57:36 +08:00 |
|
曹前明
|
f6609cd387
|
同步数据库
|
2022-06-29 13:26:50 +08:00 |
|
曹前明
|
4c2c0db577
|
ability 增加destory接口
|
2022-06-29 11:07:34 +08:00 |
|
曹前明
|
10c067240f
|
更新缓存功能
|
2022-06-21 14:20:21 +08:00 |
|
曹前明
|
a435834a33
|
增加grade 为实验室检验机构
|
2022-06-07 14:46:21 +08:00 |
|
曹前明
|
48b7267bb1
|
权限代码修改
|
2022-06-07 09:55:11 +08:00 |
|
曹前明
|
97ea46bed5
|
新增资质无变化能力无变化
|
2022-06-07 09:00:21 +08:00 |
|
曹前明
|
5a9524eef0
|
新增资质无变化能力无变化
|
2022-06-07 08:59:35 +08:00 |
|
曹前明
|
32ddaeacae
|
尝试修改
|
2022-06-06 15:32:54 +08:00 |
|
曹前明
|
bad4e27c0d
|
qualiupdate bug
|
2022-06-06 15:24:13 +08:00 |
|
曹前明
|
c5070eee2e
|
qaction detail 接口
|
2022-06-06 14:57:08 +08:00 |
|
曹前明
|
a9b00f638f
|
qaction quali update bug
|
2022-06-06 14:07:25 +08:00 |
|
曹前明
|
76882a3d83
|
serializer 增加end_date
|
2022-06-06 13:52:32 +08:00 |
|
曹前明
|
f54906b328
|
quali增加file字段
|
2022-06-06 13:42:42 +08:00 |
|
曹前明
|
a9c8e7da4d
|
新增能力增加多个数量字段
|
2022-06-06 13:29:43 +08:00 |
|
曹前明
|
54c7d7719d
|
value2 dict bug
|
2022-06-06 09:27:22 +08:00 |
|
曹前明
|
33eb8ffbc7
|
service_ok bug
|
2022-06-06 09:04:41 +08:00 |
|
曹前明
|
28f7e26206
|
value2 detail
|
2022-06-06 08:40:13 +08:00 |
|
曹前明
|
9332e5fc34
|
删除权限
|
2022-06-02 16:28:41 +08:00 |
|
曹前明
|
b9e66f4bd7
|
返回详细内容
|
2022-06-02 15:06:58 +08:00 |
|
曹前明
|
defcb4aa7f
|
详情接口
|
2022-06-02 14:21:02 +08:00 |
|
曹前明
|
284fdcc114
|
增加返回信息，操作删除权限
|
2022-06-02 14:14:57 +08:00 |
|
曹前明
|
c54f3842fa
|
增加返回信息，操作删除权限
|
2022-06-02 14:13:27 +08:00 |
|
曹前明
|
e7321aa0ce
|
增加返回信息，操作删除权限
|
2022-06-02 14:09:42 +08:00 |
|
曹前明
|
48cd7affe3
|
报送操作确认不可删除
|
2022-06-02 08:56:36 +08:00 |
|
曹前明
|
d96aaa4491
|
qaction create 权限
|
2022-06-01 14:03:38 +08:00 |
|
曹前明
|
99bce06fb9
|
查询参数
|
2022-06-01 13:50:50 +08:00 |
|
曹前明
|
54eaa83846
|
服务查询bug
|
2022-06-01 13:43:17 +08:00 |
|
曹前明
|
415f3e68c6
|
bug修改
|
2022-06-01 11:35:04 +08:00 |
|
曹前明
|
84c3991b1f
|
bug修改
|
2022-06-01 11:14:42 +08:00 |
|
曹前明
|
8d6d63ccfe
|
bug修改
|
2022-05-31 16:46:54 +08:00 |
|
曹前明
|
70bd6492df
|
city查询参数
|
2022-05-31 16:43:24 +08:00 |
|
曹前明
|
cfa91f4684
|
city查询参数
|
2022-05-31 16:37:52 +08:00 |
|
曹前明
|
a9658b0f55
|
省市数据
|
2022-05-30 16:08:43 +08:00 |
|
曹前明
|
bc7964474a
|
资质缓存
|
2022-05-19 11:47:50 +08:00 |
|
曹前明
|
b5e961bc64
|
接口测试完毕
|
2022-05-19 09:59:16 +08:00 |
|
曹前明
|
a48c4204a9
|
province city url
|
2022-05-18 17:52:06 +08:00 |
|
曹前明
|
32c7d19c82
|
qtask url
|
2022-05-18 17:01:52 +08:00 |
|
曹前明
|
6800376519
|
资质报送后端接口
|
2022-05-16 12:35:02 +08:00 |
|
caoqianming
|
d36fea5023
|
视频观看记录更新错误
|
2022-05-08 10:08:55 +08:00 |
|
caoqianming
|
adc1e54ab7
|
更新视频观看信息bug
|
2022-04-21 10:10:30 +08:00 |
|
caoqianming
|
57d91c4873
|
增加videoupdateserializer
|
2022-04-21 09:06:22 +08:00 |
|
caoqianming
|
269f78d9a1
|
bug修改
|
2022-04-21 08:57:15 +08:00 |
|
caoqianming
|
7c2a5f78b3
|
vode 增加排序字段 按catory多层级筛选
|
2022-04-20 16:30:33 +08:00 |
|
caoqianming
|
6535ad167d
|
code play bug
|
2022-04-14 14:32:56 +08:00 |
|
caoqianming
|
43863ee2d1
|
get play code 增加expireTimeStamp
|
2022-04-14 14:22:26 +08:00 |
|
caoqianming
|
7766afa1b6
|
playcode bug
|
2022-04-14 10:33:34 +08:00 |
|
caoqianming
|
0df96ee74c
|
获取签名不用try
|
2022-04-14 10:31:17 +08:00 |
|
caoqianming
|
fd2af58c8e
|
修改bug
|
2022-04-14 08:32:40 +08:00 |
|
caoqianming
|
531a44daa1
|
生成播放签名
|
2022-04-14 08:29:50 +08:00 |
|
caoqianming
|
e08ffe580e
|
缓存时间设短
|
2022-04-12 15:13:17 +08:00 |
 shilixia
|
01fa4d4181
|
erjidanweibaosong
|
2022-03-02 16:04:29 +08:00 |
|
shilixia
|
73ba89f20f
|
xiugai
|
2021-12-14 17:01:21 +08:00 |
|
shilixia
|
7bdd1a6c8a
|
咨询资料分享
|
2021-12-13 10:48:19 +08:00 |
|
caoqianming
|
fb2174bff4
|
修改的bug
|
2021-10-12 11:28:06 +08:00 |
|
caoqianming
|
118ebb0a77
|
查看下级单位的报送反馈
|
2021-10-12 11:18:30 +08:00 |
|
caoqianming
|
5ad3146972
|
反馈文件可查看子公司的
|
2021-10-12 11:03:55 +08:00 |
|
shilixia
|
ea995eb8ca
|
fankui
|
2021-09-09 10:35:48 +08:00 |
|
shilixia
|
32c7776b25
|
xial
|
2021-09-08 14:26:21 +08:00 |
|
caoqianming
|
3284fe22cb
|
修改bug
|
2021-09-01 15:26:25 +08:00 |
|
caoqianming
|
125b03f5f8
|
能力报送权限
|
2021-08-27 15:39:26 +08:00 |
|
caoqianming
|
976858a6a3
|
能力报送权限
|
2021-08-27 15:35:35 +08:00 |
|
caoqianming
|
a588efb21d
|
能力上报权限
|
2021-08-27 15:30:12 +08:00 |
|
caoqianming
|
135c3d65b9
|
个人观看记录排序
|
2021-08-25 13:52:47 +08:00 |
|
caoqianming
|
91b7e692ed
|
该视频本人观看信息bug
|
2021-08-24 13:41:02 +08:00 |
|
caoqianming
|
c6ac2434e8
|
资质能力报送
|
2021-08-24 11:13:03 +08:00 |
|
caoqianming
|
4a6bc08ad0
|
个人观看记录
|
2021-08-24 09:44:48 +08:00 |
|
caoqianming
|
0a4bed8391
|
主动报送提交
|
2021-08-23 09:12:48 +08:00 |
|
caoqianming
|
1d0e645f19
|
查询
|
2021-08-10 09:29:05 +08:00 |
|
caoqianming
|
9ff8d3106c
|
导入校验能力bug
|
2021-07-30 09:14:41 +08:00 |
|
caoqianming
|
69429a360c
|
一个bug
|
2021-07-29 15:35:50 +08:00 |
|
caoqianming
|
d39eddba7c
|
批量删除校验能力
|
2021-07-29 11:14:59 +08:00 |
|
caoqianming
|
bc2e397af3
|
导入校验能力
|
2021-07-29 10:46:29 +08:00 |
|
caoqianming
|
064e44f6fc
|
校准能力 part1
|
2021-07-28 09:18:49 +08:00 |
|
caoqianming
|
e99cab6d03
|
print报错
|
2021-07-21 14:54:43 +08:00 |
|
caoqianming
|
e11447b800
|
django cache 有问题
|
2021-07-20 16:52:32 +08:00 |
|
caoqianming
|
d455824404
|
检查bug修复
|
2021-07-12 11:53:21 +08:00 |
|
caoqianming
|
79d43b90c0
|
检查之后返回检查记录
|
2021-07-12 10:43:37 +08:00 |
|
caoqianming
|
c5d44ffcf6
|
视频总播放记录
|
2021-07-08 15:42:51 +08:00 |
|
caoqianming
|
6e4c2c39f2
|
视频播放总计数
|
2021-07-08 15:39:47 +08:00 |
|
caoqianming
|
f9deb7e916
|
更新视频播放总统计
|
2021-07-08 15:18:23 +08:00 |
|
caoqianming
|
161b1c5457
|
更新本人观看视频信息bug
|
2021-07-06 10:32:36 +08:00 |
|
caoqianming
|
22c30a47b5
|
更新本人视频观看信息
|
2021-07-06 10:21:08 +08:00 |
caoqianming
|
4a4038c78d
|
同步数据库
|
2021-07-06 10:10:03 +08:00 |
|
caoqianming
|
b73ca096ef
|
个人观看记录更新
|
2021-07-06 10:03:59 +08:00 |
|
caoqianming
|
ddba9c0b9a
|
新增观看次数
|
2021-07-05 16:55:54 +08:00 |
|
caoqianming
|
60df3aeaad
|
vod编码
|
2021-07-02 08:41:57 +08:00 |
|
caoqianming
|
3168a1e913
|
修改文件访问权限验证
|
2021-06-29 13:30:26 +08:00 |
|
caoqianming
|
49ef3c7314
|
migrate
|
2021-06-29 09:50:53 +08:00 |
|
caoqianming
|
84e72aa1f3
|
增加视频id字段
|
2021-06-29 09:34:55 +08:00 |
|
caoqianming
|
0eb76f9403
|
点播后台接口
|
2021-06-28 10:47:25 +08:00 |
|
caoqianming
|
ac85dc2486
|
vod方案决定
|
2021-06-25 17:08:42 +08:00 |
|
caoqianming
|
ac53bf88ba
|
质量文档序列化器
|
2021-06-25 16:48:23 +08:00 |
|
caoqianming
|
9a60db1652
|
文档接口提交
|
2021-06-25 11:20:02 +08:00 |
|
caoqianming
|
4dbb2cd01b
|
质量文档接口
|
2021-06-25 11:14:58 +08:00 |
|
caoqianming
|
5b5e7a5dd3
|
解绑微信
|
2021-06-25 09:43:15 +08:00 |
|
caoqianming
|
ae345f232d
|
删除任务内相关内容
|
2021-06-21 17:03:21 +08:00 |
|
caoqianming
|
ad395c2649
|
清单模板
|
2021-06-17 17:25:26 +08:00 |
|
caoqianming
|
ba8c71e056
|
cma_search 调整到阿里云测试环境
|
2021-06-17 11:59:27 +08:00 |
|
caoqianming
|
b977024972
|
组长权限控制
|
2021-05-13 09:35:14 +08:00 |
|
caoqianming
|
a360299bc2
|
权限控制bug
|
2021-05-13 09:25:33 +08:00 |
|
caoqianming
|
627d506712
|
小程序 media url
|
2021-05-11 16:59:53 +08:00 |
|
caoqianming
|
ff94cedce1
|
小程序media token
|
2021-05-11 16:04:12 +08:00 |
|
caoqianming
|
7885af03e3
|
小程序图片验证
|
2021-05-11 14:02:20 +08:00 |
|
caoqianming
|
6c21b1eaf6
|
检查leader bug
|
2021-05-11 13:36:15 +08:00 |
|
caoqianming
|
90abf36c61
|
nginx 文件鉴权
|
2021-05-07 16:12:17 +08:00 |
|
caoqianming
|
5b33dfb76c
|
pc检查页面优化
|
2021-05-07 14:41:07 +08:00 |
|
caoqianming
|
4841001751
|
指派人的bug
|
2021-04-30 15:24:30 +08:00 |
|
caoqianming
|
8817757f5e
|
任务组织表创建bug
|
2021-04-30 14:39:45 +08:00 |
|
caoqianming
|
f0ec4691bc
|
任务报送批量确认
|
2021-04-30 13:24:34 +08:00 |