Commit Graph

1023 Commits

Author SHA1 Message Date
daitingting
d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08: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
b9670165ab * Fix bug #21653. 2022-04-13 14:44:01 +08:00
tianshujie
f612dcd079 * Fix bug 17551. 2022-04-13 14:27:53 +08: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
Zongjun Lan
8ef47e9292 * fix bug *18722 2022-04-12 10:58:35 +08: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
Zongjun Lan
f61cdef8d0 * fix bug #21424 2022-04-02 10:56:10 +08:00
Zongjun Lan
0ad0b1938c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-01 15:32:11 +08:00
Zongjun Lan
06f066f45d * fix bug #18722 2022-04-01 14:15:11 +08:00
zenggang
40f9a85a6f * Fix bug#21097,21096 2022-03-31 01:35:50 +00: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
6fa5c475a8 *Fixbug #19687 2022-03-30 15:27:20 +08:00
sunjun
5812bb99cb *Fixbug #19687 2022-03-30 11:35:15 +08:00
tianshujie
7885b87ef3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug16101 2022-03-29 14:30:55 +08:00
tianshujie
a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00
zhouxin
376de6d824 * Fix bug #16707. 2022-03-29 04:28:39 +00:00
zhouxin
603ae3bfdc * Fix bug #16707. 2022-03-29 03:14:50 +00: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
zhouxin
25338e33f5 * Fix bug #14512. 2022-03-28 07:23:53 +00:00
朱金勇
530f055e7b Merge branch 'sgm_storytest' into 'master'
* Remove unused code and fix bug.

See merge request easycorp/zentaopms!2545
2022-03-25 06:29:10 +00:00
孙广明
4b50d187e4 * Remove unused code and fix bug. 2022-03-25 14:25:26 +08:00
mayue
71d64d8e65 * Handling PHP compatibility issues. 2022-03-25 11:05:18 +08:00
孙广明
02e91b8ac5 * Fix program whitelist bug. 2022-03-25 10:27:56 +08:00
zhouxin
06dcb59138 * Fix bug #18307. 2022-03-25 01:22:21 +00:00
tianshujie
9b7d8686c7 * Modify the judgment logic. 2022-03-24 09:42:08 +08:00
tianshujie
e9ee8a176d * Fix bug #19072. 2022-03-24 09:35:39 +08:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
xieqiyu
23a898218d * Fix bug#20850. 2022-03-16 16:28:32 +08: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
tianshujie
3246d38e73 * Fix bug #20300. 2022-03-03 16:50:52 +08:00
Hao Sun
aa30172fea * Task #49295, optimize UI for avatar. 2022-03-01 13:24:13 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
songchenxuan
b4a5b7bff2 *Translate. 2022-02-24 16:52:16 +08:00
liumengyi
9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
songchenxuan
66bbe4cfbe *Translate. 2022-02-24 16:31:58 +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
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
tanghucheng
966f00c07a * finish task #49421,49338. 2022-02-17 14:58:59 +08:00