 王怡栋
|
ebd8840dbb
|
Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'
* Fix bug #22520
See merge request easycorp/zentaopms!3435
(cherry picked from commit 670520548f)
faf8ee28 * Fix bug #22520
|
2022-05-17 08:49:15 +00:00 |
|
|
wangyuting2
|
34609e9036
|
* Optimize code.
|
2022-05-12 13:33:56 +08:00 |
|
|
wangyuting2
|
28f4a384ee
|
* Add biz version judgment conditions.
|
2022-05-12 13:27:41 +08:00 |
|
|
wangyuting2
|
6331cede38
|
* Fix workflow bug.
|
2022-05-12 13:07:37 +08:00 |
|
|
xieqiyu
|
ce7c0afdc1
|
* Finish task#53666.
|
2022-05-11 18:24:13 +08:00 |
|
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
|
wangyuting2
|
d29cf03d41
|
* Merge lib dao code.
|
2022-05-07 13:11:44 +08:00 |
|
|
孙广明
|
6f60b5627a
|
Merge branch 'master_xieqiyu_22092' into 'master'
* Fix bug#22092.
See merge request easycorp/zentaopms!3199
|
2022-04-28 10:33:01 +00:00 |
|
|
xieqiyu
|
aa74a708de
|
* Fix bug#22100.
|
2022-04-28 17:34:10 +08:00 |
|
|
孙广明
|
2db91483d3
|
Merge branch 'sprint/master_zhouxudong_22038' into 'master'
* Fix bug #22038.
See merge request easycorp/zentaopms!3163
|
2022-04-28 09:11:30 +00:00 |
|
|
zhouxudong
|
fd52256122
|
* Fix bug #22038.
|
2022-04-28 03:27:09 +00:00 |
|
|
zhouxudong
|
e2aa928abe
|
* Fix bug #22038.
|
2022-04-28 02:57:42 +00:00 |
|
|
liyuchun
|
537c1bea2d
|
* Fix bug #15039.
|
2022-04-28 02:06:10 +00:00 |
|
|
zhouxudong
|
0c2651b436
|
* Fix bug #22038.
|
2022-04-27 07:45:27 +00:00 |
|
|
wangyidong
|
f77b7875cc
|
* adjust for kilin.
|
2022-04-26 09:46:33 +08:00 |
|
|
caoyanyi
|
fa3411ce92
|
* Fix bug #15292.
|
2022-04-21 01:04:50 +00:00 |
|
|
李玉春
|
243dca8934
|
Merge branch 'bug_21823' into 'master'
Fix bug #21823,7042
See merge request easycorp/zentaopms!3032
|
2022-04-20 07:55:40 +00:00 |
|
|
zenggang
|
7c159eeb96
|
* Fix bug #21823,7042
|
2022-04-20 06:58:50 +00:00 |
|
|
Hao Sun
|
6dc60ceead
|
* fix issue on show avatar.
|
2022-04-20 11:31:36 +08:00 |
|
|
孙广明
|
425a272096
|
Merge branch 'liyuchun_fixbug_12931' into 'master'
* Fix bug #20178.
See merge request easycorp/zentaopms!3020
|
2022-04-20 02:36:43 +00:00 |
|
|
Hao Sun
|
c25231c297
|
* optimize helper method "js::locate", support for using app as target.
|
2022-04-19 16:06:19 +08:00 |
|
|
liyuchun
|
2d3195b0e6
|
* Fix bug #20178.
|
2022-04-19 11:16:53 +08:00 |
|
|
liyuchun
|
13d354ba8c
|
* Fix bug #21518.
|
2022-04-18 11:35:36 +08:00 |
|
|
zenggang
|
0ccd5bf9b7
|
* Fix bug#21002
|
2022-04-12 07:19:36 +00:00 |
|
|
zenggang
|
f69222b56e
|
* Fix bug#20630
|
2022-04-08 06:24:00 +00:00 |
|
|
王怡栋
|
4fa721b0bb
|
Merge branch '165_package'
|
2022-04-01 15:30:36 +08:00 |
|
|
孙广明
|
0bd44c1511
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #20804,20946.
See merge request easycorp/zentaopms!2598
|
2022-03-29 05:58:04 +00:00 |
|
|
liyuchun
|
9f74fe748f
|
* Fix bug #20804,20946.
|
2022-03-29 09:34:09 +08:00 |
|
|
王怡栋
|
15a3516aca
|
Merge branch 'master' into 165_package
|
2022-03-28 08:50:18 +08:00 |
|
|
hufangzhou
|
ec34fa3832
|
* Update the library of parse markdown.
|
2022-03-25 14:46:14 +08:00 |
|
|
hufangzhou
|
fac6327ee8
|
* Update the library of parse markdown.
|
2022-03-25 14:13:54 +08:00 |
|
|
zenggang
|
784e153159
|
* Finish task#51115,51116,51120,51121,51133
|
2022-03-22 07:11:57 +00:00 |
|
|
liyuchun
|
0187fb80c7
|
Merge branch 'devops24'
|
2022-03-22 08:28:32 +08:00 |
|
|
王怡栋
|
b3cca161cc
|
* adjust for install page in lite.
|
2022-03-18 09:49:05 +08:00 |
|
|
liyuchun
|
b6db2c5c55
|
* Fix bug #50908.
|
2022-03-17 16:11:19 +08:00 |
|
|
zenggang
|
8eaba29e5f
|
* Adjust code
|
2022-03-09 01:11:39 +00:00 |
|
|
zenggang
|
515dd085c4
|
* Adjust code
|
2022-03-08 09:40:28 +00:00 |
|
|
zenggang
|
817f4dd5f0
|
* Fix bug#20299
|
2022-03-07 08:21:39 +00:00 |
|
|
孙广明
|
7b962c4e38
|
Merge branch 'pailei'
|
2022-03-07 10:56:26 +08:00 |
|
|
zenggang
|
c2e2385a9b
|
* Adjust code
|
2022-03-07 00:48:08 +00:00 |
|
|
zenggang
|
943c0d3c1a
|
* Fix bug#20308,20299
|
2022-03-04 09:24:28 +00:00 |
|
|
Hao Sun
|
2fc8041453
|
* Task #49295, optimize UI for avatar.
|
2022-03-01 13:29:05 +08:00 |
|
|
Hao Sun
|
aa30172fea
|
* Task #49295, optimize UI for avatar.
|
2022-03-01 13:24:13 +08:00 |
|
|
mayue
|
ae867e8351
|
* Finish task #49885.
|
2022-02-28 14:36:30 +08:00 |
|
|
liyuchun
|
89c52df9b7
|
* Fix bug #19869,19876.
|
2022-02-22 17:21:35 +08:00 |
|
|
liyuchun
|
0947d84471
|
* Fix bug #19853.
|
2022-02-22 15:49:56 +08:00 |
|
|
liyuchun
|
b8f8447653
|
* Fix error.
|
2022-02-22 09:14:59 +08:00 |
|
|
zenggang
|
1c503bcf58
|
* Finish task#49221
|
2022-02-21 08:33:58 +00:00 |
|
|
王怡栋
|
07f8b9c797
|
Merge branch 'devops22_liyuchun' into 'master'
Finish task #49226.
See merge request easycorp/zentaopms!1866
|
2022-02-21 08:08:32 +00:00 |
|
|
liyuchun
|
92294da65b
|
* Finish task #49226.
|
2022-02-21 15:27:51 +08:00 |
|