Commit Graph

464 Commits

Author SHA1 Message Date
leiyong
4198e05c9e * Adjust code. 2022-05-19 06:53:37 +00:00
leiyong
d92c911062 * Finish task#54469. 2022-05-19 05:15:50 +00:00
leiyong
69fe59f541 * Finish task#54469. 2022-05-19 05:06:43 +00:00
zenggang
e41dc21372 * Fix bugs 2022-05-12 09:06:35 +00:00
孙广明
621e257ae1 Merge branch 'sprint189_zg_53653' into 'master'
Finish task#53653,53657

See merge request easycorp/zentaopms!3313
2022-05-11 09:37:07 +00:00
zenggang
b5093f3a1b * Code for task#53657 2022-05-11 08:32:50 +00:00
wangyuting2
d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
zenggang
d8d6ce45f7 * Finish task#53653 2022-05-10 08:58:00 +00:00
zhouxudong
79675da1e0 * Fix bug #220.38. 2022-04-28 05:11:23 +00:00
zhouxudong
5db8ea88b1 * Fix bug #22038. 2022-04-28 05:08:03 +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
tianshujie
e681135a3a * Fix bug #21643. 2022-04-13 14:22:32 +08:00
孙广明
e172ea39b6 Merge branch 'fixbug_zhouxin_18307' into 'master'
* Fix bug #18307.

See merge request easycorp/zentaopms!2527
2022-04-13 01:34:42 +00:00
朱金勇
e1eb543ed7 Merge branch 'app_zry' into 'master'
App zry

See merge request easycorp/zentaopms!2872
2022-04-12 07:28:24 +00:00
zhengrunyu
7d3a91ab39 * Change function name for getBudgetWithUnit. 2022-04-12 09:53:30 +08:00
zhengrunyu
fba6ac6a0e * Conversion budget unit. 2022-04-12 08:56:26 +08:00
李玉春
7dbf565a76 Merge branch 'fixbug_sunjun_19687' into 'master'
Fixbug sunjun 19687

See merge request easycorp/zentaopms!2644
2022-03-31 00:24:37 +00:00
sunjun
83507debe8 *Fixbug #19687 2022-03-30 20:15:16 +08:00
sunjun
5812bb99cb *Fixbug #19687 2022-03-30 11:35:15 +08:00
tianshujie
a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00
tianshujie
7b6e89c8d6 * Fix bug #21213. 2022-03-29 09:07:47 +08:00
zhouxin
6bc82e81c1 * Fix bug #14512. 2022-03-28 09:19:14 +00:00
孙广明
4b50d187e4 * Remove unused code and fix bug. 2022-03-25 14:25:26 +08:00
zhouxin
06dcb59138 * Fix bug #18307. 2022-03-25 01:22:21 +00:00
tianshujie
df14bc65ef * Fix icon for kanban project. 2022-03-16 10:39:50 +08:00
tianshujie
69bd684cd3 * Fix bug #20353. 2022-03-04 15:47:17 +08:00
liumengyi
c237c59b5e * Fix bug #20339. 2022-03-04 13:57:01 +08:00
Hao Sun
aa30172fea * Task #49295, optimize UI for avatar. 2022-03-01 13:24:13 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhujinyong
49af622fd8 * Move exit to return. 2022-02-22 14:25:14 +08:00
liyuchun
0d16a79b63 * Fix bug #19323. 2022-02-15 08:22:25 +08:00
tianshujie
58c2fe04af *Fix bug #18475. 2022-01-17 08:48:42 +08:00
mayue
fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00
mayue
15d588491f * Revert code. 2022-01-04 17:19:45 +08:00
zhujinyong
e944c4a428 Merge branch 'sprint/180_sunhao/task46524' into sprint/180 2021-12-31 11:21:25 +08:00
Hao Sun
1bdc313562 * Task #46524, refactor some pages with user-picker. 2021-12-30 17:35:41 +08:00
mayue
64d6d35a87 * Optimize code. 2021-12-30 17:01:13 +08:00
mayue
9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
朱金勇
161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
2021-12-10 06:15:15 +00:00
xieqiyu
ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
hufangzhou
ab5b5bdf87 * Fix bug #17311. 2021-12-09 16:54:30 +08:00
hufangzhou
73b43980eb * Fix an error for lang item. 2021-12-09 10:12:08 +08:00
孙广明
13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
王怡栋
f25d797b54 * adjust for flow. 2021-12-02 10:06:02 +08:00
zhujinyong
8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
Hao Sun
39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
hufangzhou
0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
孙广明
f9978c4841 * Code for task #44005. 2021-11-04 17:07:37 +08:00