 shilixia
|
9e91c90213
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2022-01-27 10:31:01 +08:00 |
|
shilixia
|
d551af491a
|
renyuan
|
2022-01-27 10:30:48 +08:00 |
 caoqianming
|
ec0bcb2fd0
|
employee list dept_字段错误
|
2022-01-27 10:17:24 +08:00 |
|
caoqianming
|
f8bfee6f89
|
employee 增加list 接口
|
2022-01-27 09:56:11 +08:00 |
|
caoqianming
|
8cb4f244d1
|
上传证件照bug
|
2022-01-27 09:33:34 +08:00 |
|
caoqianming
|
d54ea2c2dc
|
上传照片bug
|
2022-01-27 09:28:34 +08:00 |
|
caoqianming
|
cb2986ca91
|
上传照片bug
|
2022-01-26 17:03:24 +08:00 |
|
caoqianming
|
b88ad25749
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2022-01-26 16:42:25 +08:00 |
|
caoqianming
|
f0fd992f18
|
考勤天数统计
|
2022-01-26 16:42:18 +08:00 |
|
caoqianming
|
e3e623c5e1
|
超过订单数量统计
|
2022-01-26 16:41:52 +08:00 |
|
shilixia
|
2c937c983f
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2022-01-26 15:59:59 +08:00 |
|
shilixia
|
6de8c40d60
|
xiuagi
|
2022-01-26 15:59:51 +08:00 |
|
caoqianming
|
fa4706207b
|
order tag not_done
|
2022-01-26 15:27:54 +08:00 |
|
caoqianming
|
492b8d547f
|
order tag not_done
|
2022-01-26 15:25:41 +08:00 |
|
caoqianming
|
dfdc035089
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2022-01-26 15:08:34 +08:00 |
|
caoqianming
|
b3a399d8aa
|
little fix
|
2022-01-26 15:08:17 +08:00 |
 shijing
|
e7d335b83b
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2022-01-26 14:00:23 +08:00 |
|
shijing
|
09f1937474
|
searchshiftandaddtwowarnings
|
2022-01-26 14:00:12 +08:00 |
|
caoqianming
|
1b5b0a5032
|
wpm mtest bug
|
2022-01-26 13:57:48 +08:00 |
|
caoqianming
|
16fb06f646
|
wpm mtest bug
|
2022-01-26 13:55:55 +08:00 |
|
caoqianming
|
a5494e8509
|
employee字段修改
|
2022-01-26 13:52:14 +08:00 |
|
caoqianming
|
4139ef91c3
|
need_to_order 接口serializer错误
|
2022-01-26 11:11:56 +08:00 |
|
caoqianming
|
0955a208cf
|
在需要的list接口增加动态字段
|
2022-01-26 11:06:23 +08:00 |
|
caoqianming
|
a2c025cdf2
|
人脸识别bug
|
2022-01-26 10:37:00 +08:00 |
|
caoqianming
|
f075b119ee
|
iproduct need_to_order筛选bug
|
2022-01-26 10:32:32 +08:00 |
|
caoqianming
|
c6080849d7
|
iproduct增加need_to_order筛选；pm增加near_done筛选
|
2022-01-26 10:27:22 +08:00 |
|
caoqianming
|
850c18ba5f
|
fit json render bug
|
2022-01-26 09:55:42 +08:00 |
|
caoqianming
|
9eab3aa592
|
iproduct list增加order to_order 字段
|
2022-01-26 09:21:23 +08:00 |
|
caoqianming
|
04b864e72f
|
上一提交的bug
|
2022-01-26 08:44:39 +08:00 |
|
caoqianming
|
47804a0835
|
资源计算返回增加count_safe字段
|
2022-01-26 08:41:03 +08:00 |
|
caoqianming
|
9d3cbbd151
|
system增加last_check_time
|
2022-01-25 17:04:24 +08:00 |
|
caoqianming
|
c98613785b
|
bug
|
2022-01-25 13:13:11 +08:00 |
|
caoqianming
|
e90213d6ce
|
wproduct 增加need_to_order字段
|
2022-01-25 11:16:43 +08:00 |
|
caoqianming
|
4ba365b243
|
order create update need_mtest
|
2022-01-25 10:57:25 +08:00 |
|
caoqianming
|
0d021f1887
|
equipsimple 增加type
|
2022-01-25 10:43:37 +08:00 |
|
shilixia
|
60f726cda6
|
ceshi
|
2022-01-25 09:57:51 +08:00 |
|
shilixia
|
938ebf1e28
|
denglijiekou
|
2022-01-25 09:56:14 +08:00 |
|
shijing
|
573f25bce6
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2022-01-25 09:54:49 +08:00 |
|
shijing
|
b3d54ce4c0
|
InterfaceChange
|
2022-01-25 09:54:40 +08:00 |
|
caoqianming
|
a5984ee239
|
修改登录地址
|
2022-01-25 09:46:35 +08:00 |
|
caoqianming
|
e5a9c46e2e
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2022-01-25 08:55:22 +08:00 |
|
caoqianming
|
c4c6b48164
|
更新em tasks update_equip_state_by_next_check_date
|
2022-01-25 08:55:14 +08:00 |
|
shijing
|
3db99496fe
|
Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
|
2022-01-25 08:48:13 +08:00 |
|
shijing
|
84ba98925d
|
0124
|
2022-01-25 08:48:05 +08:00 |
|
caoqianming
|
efc101d2a1
|
drf 动态字段 mixins
|
2022-01-24 16:21:00 +08:00 |
|
caoqianming
|
f6a7ada99f
|
drf 动态字段omit
|
2022-01-24 15:48:25 +08:00 |
|
caoqianming
|
ceb0fe2354
|
drf动态字段mixins
|
2022-01-24 15:38:52 +08:00 |
|
caoqianming
|
eaa6da6a4f
|
sam order simple bug
|
2022-01-24 15:21:07 +08:00 |
|
caoqianming
|
c39d62c9a5
|
去除is_mtested字段
|
2022-01-24 14:31:07 +08:00 |
|
caoqianming
|
444914fde9
|
wproduct list 增加order
|
2022-01-24 13:55:28 +08:00 |