Commit Graph

1013 Commits

Author SHA1 Message Date
hufangzhou
90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
孙广明
c7c2c75870 Merge branch 'sprint/master_zhouxudong_22032' into 'master'
Sprint/master zhouxudong 22032

See merge request easycorp/zentaopms!3197
2022-04-28 10:31:22 +00:00
zhouxudong
8ac71d35c5 * Fix bug #22032. 2022-04-28 09:25:28 +00:00
zhouxudong
aa0e8579cf * Fix bug #22032. 2022-04-28 09:21:47 +00:00
zhouxudong
2dd822a1f7 * Fix bug #22032. 2022-04-28 07:42:14 +00:00
zhouxudong
b8880f493e * Fix bug #22023. 2022-04-28 07:02:37 +00:00
zhouxudong
a2d0d3d6cd * Fix bug #22023. 2022-04-28 07:01:02 +00:00
zhouxudong
3ca8412a84 * Fix bug #22032. 2022-04-28 06:50:09 +00:00
zhouxudong
66648d3722 * Fix bug #22027. 2022-04-27 08:03:08 +00:00
lanzongjun
9b3b3b1e1a * fix bug #21988 2022-04-27 13:50:25 +08:00
wangyidong
47b07058f1 * code for bug #15453. 2022-04-26 13:54:55 +08:00
liumengyi
0c3aa457ce * Fix bug #3079. 2022-04-22 13:12:02 +08:00
王怡栋
6c46a39ca1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-20 11:27:06 +08:00
王怡栋
eec155064a * fix bug #20933. 2022-04-20 11:26:32 +08:00
zenggang
217cc71960 * Fix bug#14478,19305 2022-04-19 09:21:02 +00:00
zhouxudong
36946a8fb1 * Fix bug #20178. 2022-04-18 14:47:04 +08:00
zhouxudong
c449b53e4b * Fix bug #20178. 2022-04-18 13:59:09 +08:00
zhouxudong
532920579e * Fix bug #20178. 2022-04-18 13:20:44 +08:00
xieqiyu
f5b55eecfe * Fix bug#20006. 2022-04-13 15:03:57 +08:00
hufangzhou
18293e3e0d * Fix bug #15656. 2022-04-13 11:19:20 +08:00
hufangzhou
baf4a67ed8 * Fix bug #15633. 2022-04-12 09:51:09 +08:00
王怡栋
4b8ed58692 Merge branch 'sprint/fixbug_hufangzhou_doclibaction' into 'master'
* Fix the bug of doc lib related actions don't show.

See merge request easycorp/zentaopms!2755
2022-04-07 08:21:03 +00:00
tianshujie
0530b892e4 * Fix bug #18710. 2022-04-06 15:22:15 +08:00
hufangzhou
87a515c803 * Fix the bug of doc lib related actions don't show. 2022-04-06 09:53:13 +08:00
Wenrui LI
c96c0140a5 * add comment. 2022-04-01 08:59:44 +08:00
Wenrui LI
0a843861bf * fix case. 2022-04-01 08:58:35 +08:00
Chenjianyu
dfc34f44bc * Fix bug #18041, discard xuanxuan login actions from getDynamic. 2022-03-29 14:53:51 +08:00
tanghucheng
7b09af074b * Fix bug #21008. 2022-03-28 14:37:44 +08:00
tanghucheng
8f95192d7a * Fix bug #21034,21059. 2022-03-25 13:39:45 +08:00
tianshujie
67efa0838e * Modify the code judgment logic. 2022-03-25 10:58:04 +08:00
tianshujie
e36fdcb004 * Fix bug #18719. 2022-03-25 10:39:09 +08:00
孙广明
82188691db Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug #18151,13732.

See merge request easycorp/zentaopms!2516
2022-03-25 01:19:43 +00:00
liyuchun
07622ec7af * Fix bug #18151. 2022-03-24 16:21:06 +08:00
zenggang
dd5cab2011 * Finish task#51184,51176,51141 2022-03-24 06:21:10 +00:00
tianshujie
a66d11f667 * Modify the code judgment logic. 2022-03-23 11:30:14 +08:00
tianshujie
890c669631 * Modify the code judgment logic. 2022-03-23 11:23:45 +08:00
tianshujie
6dfcd7f992 * Fix bug #20919. 2022-03-23 08:53:50 +08:00
zhouxin
8d17a390c0 * Fix bug #15517. 2022-03-22 09:23:21 +00:00
王怡栋
2684fd08fe * code for task #51330. 2022-03-22 16:27:54 +08:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
liyuchun
0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
zenggang
ed17f3b7bb * Finish task#51105,51102 2022-03-18 05:17:53 +00:00
zenggang
70d00fad9e * Code for task#50697,50685 2022-03-17 03:07:38 +00:00
zhouxin
34696a7372 Fix bug #17224. 2022-03-16 08:05:15 +00:00
zenggang
4464d75123 * Finish task#50685,50680,50672 2022-03-16 05:20:20 +00:00
caoyanyi
f4f64a2ad0 * Adjust code. 2022-03-14 16:30:40 +08:00
caoyanyi
1c14ab9738 * Modify dynamic datas. 2022-03-14 16:17:43 +08:00
王怡栋
c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
hufangzhou
9640120b43 * Can not use vision field of zt_action table when upgrade. 2022-02-25 15:28:15 +08:00