 孙广明
|
2c2073fde4
|
Merge branch 'sprint/sunhao/bug22340' into 'master'
* bug #22340, update kanban.js, fix js error on click card sometimes.
See merge request easycorp/zentaopms!3498
|
2022-05-19 01:13:14 +00:00 |
|
|
Hao Sun
|
066c1f5b8b
|
* update kanban.js
|
2022-05-19 01:05:51 +00:00 |
|
|
Hao Sun
|
00b49e5139
|
* update zui.js.
|
2022-05-19 08:59:29 +08:00 |
|
|
王怡栋
|
41f77027bc
|
Merge branch 'sprint/master_zhouxudong_54491_1' into 'master'
* Finish task #54491
See merge request easycorp/zentaopms!3495
|
2022-05-19 00:55:52 +00:00 |
|
|
Hao Sun
|
c2c25b68ae
|
* bug #22340, update kanban.js, fix js error on click card sometimes.
|
2022-05-19 08:50:37 +08:00 |
|
|
李玉春
|
79006b3f89
|
Merge branch 'sprint/tianshujie_22636' into 'master'
* Fix bug #22636.
See merge request easycorp/zentaopms!3494
|
2022-05-18 08:57:05 +00:00 |
|
|
tianshujie
|
56bb8fbd35
|
* Fix bug #22636.
|
2022-05-18 16:53:12 +08:00 |
|
|
zhouxudong
|
9dab175600
|
* Finish task #54491_1
|
2022-05-18 08:52:46 +00:00 |
|
|
朱金勇
|
7646473eda
|
Merge branch 'sprint/sunhao/kanban' into 'master'
* update kanban lib, and optimize dragging style for it.
See merge request easycorp/zentaopms!3493
|
2022-05-18 08:51:18 +00:00 |
|
|
tianshujie
|
45e4fcdfab
|
* Fix bug #22636.
|
2022-05-18 16:51:09 +08:00 |
|
|
Hao Sun
|
dbbe0f559b
|
* update kanban lib, and optimize dragging style for it.
|
2022-05-18 16:44:16 +08:00 |
|
|
孙广明
|
21db946db3
|
Merge branch 'sprint/190_zg_unit' into 'master'
* Unit test
See merge request easycorp/zentaopms!3491
|
2022-05-18 08:44:08 +00:00 |
|
|
zenggang
|
f98a844ade
|
* Unit test
|
2022-05-18 08:37:10 +00:00 |
|
|
孙广明
|
9eb969342d
|
Merge branch 'sprint/191_zhouxin_54351' into 'master'
Sprint/191 zhouxin 54351
See merge request easycorp/zentaopms!3490
|
2022-05-18 08:09:34 +00:00 |
|
|
李玉春
|
f5fb327f55
|
Merge branch 'sprint/191_liumengyi_fixbug' into 'master'
* Fix bug #22633.
See merge request easycorp/zentaopms!3488
|
2022-05-18 08:04:59 +00:00 |
|
|
liumengyi
|
1bc26d519a
|
* Code format.
|
2022-05-18 16:03:25 +08:00 |
|
|
孙广明
|
3dfe14a43c
|
Merge branch 'sunhuawei_fixbug_22626' into 'master'
*Fix bug#22626.
See merge request easycorp/zentaopms!3489
|
2022-05-18 08:01:24 +00:00 |
|
|
孙广明
|
55d5da68d6
|
Merge branch 'sunhuawei_fixbug_22621' into 'master'
*Fix bug #22621.
See merge request easycorp/zentaopms!3487
|
2022-05-18 08:01:17 +00:00 |
|
|
孙华伟
|
0d132275da
|
Update recordestimate.js
|
2022-05-18 07:59:48 +00:00 |
|
|
孙华伟
|
30c5754f26
|
*Fix bug#22626.
|
2022-05-18 15:59:01 +08:00 |
|
|
孙广明
|
bfdcc7b924
|
Merge branch 'sunhuawei_fixbug_22616' into 'master'
*Fix bug#22616.
See merge request easycorp/zentaopms!3479
|
2022-05-18 07:56:29 +00:00 |
|
|
liumengyi
|
06a5840978
|
* Fix bug #22633.
|
2022-05-18 15:52:51 +08:00 |
|
|
zhouxin
|
c5be32065d
|
* Fix bug.
|
2022-05-18 07:50:26 +00:00 |
|
|
孙广明
|
0be8c4e480
|
Merge branch 'sprint/190_mayue_bug#22246' into 'master'
* Fix bug #22246.
See merge request easycorp/zentaopms!3484
|
2022-05-18 07:45:08 +00:00 |
|
|
zhouxin
|
094db2e505
|
* Adjust code.
|
2022-05-18 07:39:05 +00:00 |
|
|
李玉春
|
20f96a7d4c
|
Merge branch 'sprint/191_liumengyi_22628' into 'master'
* Fix bug #22628.
See merge request easycorp/zentaopms!3485
|
2022-05-18 07:32:38 +00:00 |
|
|
zhouxin
|
5ef4782e82
|
* Finish task #54351.
|
2022-05-18 07:31:45 +00:00 |
|
|
liumengyi
|
be5daac0ba
|
* Fix bug #22628.
|
2022-05-18 15:23:12 +08:00 |
|
|
mayue
|
aa0b81f0a6
|
* Fix bug #22246.
|
2022-05-18 07:19:19 +00:00 |
|
|
王怡栋
|
e6e4e7dddb
|
Merge branch 'sgm_approval' into 'master'
* Add approval sql.
See merge request easycorp/zentaopms!3483
|
2022-05-18 07:09:33 +00:00 |
|
|
孙广明
|
11310cee33
|
* Add approval sql.
|
2022-05-18 15:07:08 +08:00 |
|
|
孙华伟
|
587bc3c414
|
*Fix bug #22621.
|
2022-05-18 14:48:09 +08:00 |
|
|
王怡栋
|
cbef1578ca
|
Merge branch 'master_xieqiyu_54467' into 'master'
* Code for task#54467.
See merge request easycorp/zentaopms!3481
|
2022-05-18 06:21:47 +00:00 |
|
|
xieqiyu
|
b223f55900
|
* Code for task#54467.
|
2022-05-18 14:00:29 +08:00 |
|
|
孙华伟
|
b59fb9cc1c
|
*Fix bug#22616.
|
2022-05-18 13:43:48 +08:00 |
|
|
李玉春
|
7b4f3b4abd
|
Merge branch 'sprint/191_liumengyi_22590' into 'master'
* Fix bug #22590.
See merge request easycorp/zentaopms!3478
|
2022-05-18 05:38:52 +00:00 |
|
|
liumengyi
|
497aea6b14
|
* Fix bug #22590.
|
2022-05-18 13:36:06 +08:00 |
|
|
wangyidong
|
98df6e3ffb
|
* adjust code for tid.
|
2022-05-18 13:09:40 +08:00 |
|
|
孙广明
|
fe226b7020
|
Merge branch 'fixbug_sunjun_54324' into 'master'
fixbug_sunjun_54324
See merge request easycorp/zentaopms!3476
|
2022-05-18 05:03:43 +00:00 |
|
|
sunjun
|
728d85916e
|
fixbug_sunjun_54324
|
2022-05-18 04:27:46 +00:00 |
|
|
zhujinyong
|
56413a2748
|
Merge branch 'sprint/sunhao/zui_chart'
|
2022-05-18 12:18:07 +08:00 |
|
|
zhujinyong
|
34954c70e4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-05-18 11:59:46 +08:00 |
|
|
zhujinyong
|
ec9b521a31
|
Merge branch 'sprint/sunhao/zui'
|
2022-05-18 11:55:38 +08:00 |
|
|
孙广明
|
958b890941
|
Merge branch 'sprint/190_mayue_bug#22587' into 'master'
* Fix bug #22587.
See merge request easycorp/zentaopms!3475
|
2022-05-18 03:18:38 +00:00 |
|
|
孙广明
|
cecff5ddec
|
Merge branch 'sprint/191_liumengyi_54336' into 'master'
Sprint/191 liumengyi 54336
See merge request easycorp/zentaopms!3474
|
2022-05-18 03:17:58 +00:00 |
|
|
liumengyi
|
e83da7c524
|
* Fix bug for task #54336.
|
2022-05-18 11:15:21 +08:00 |
|
|
mayue
|
9c336a223e
|
* Fix bug #22587.
|
2022-05-18 03:15:15 +00:00 |
|
|
孙广明
|
cc83dcc446
|
Merge branch 'sprint/190_mayue_bug#22574' into 'master'
* Fix bug #22574.
See merge request easycorp/zentaopms!3472
|
2022-05-18 03:12:11 +00:00 |
|
|
孙广明
|
fe6c8d18a2
|
Merge branch 'sprint/190_zg_54208' into 'master'
* Finish task#54208
See merge request easycorp/zentaopms!3469
|
2022-05-18 03:11:51 +00:00 |
|
|
mayue
|
117865e63d
|
* Optimize code.
|
2022-05-18 03:11:12 +00:00 |
|