Commit Graph

489 Commits

Author SHA1 Message Date
zenggang
c368f63f6d * Adjust code 2022-07-22 02:01:47 +00:00
zenggang
5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
zhouxudong
ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
zhouxudong
951d41d721 * Finish task #60393. 2022-07-12 02:54:06 +00:00
tianshujie
fe226c094b * Fix bug #24913. 2022-07-08 15:17:02 +08:00
zhouxudong
1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
zhouxudong
bc16e41c73 * Fix bug #24472. 2022-06-30 02:44:29 +00:00
zhouxudong
eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
zhouxudong
463b4d0710 * Finish task #57859. 2022-06-24 02:14:08 +00:00
王怡栋
4dab93ee3b Merge branch 'sprint/master_zhouxudong_57864' into 'master'
* Finish task #57864.

See merge request easycorp/zentaopms!4082
2022-06-23 00:40:27 +00:00
zhouxudong
bc416e40fc * Finish task #57864. 2022-06-22 10:11:06 +00:00
xieqiyu
21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
Hao Sun
72d4c854d3 * prevent user move row by click a link. 2022-06-17 07:39:03 +00:00
Hao Sun
775746df0a * optimize program list, support to preserve nested state. 2022-06-17 07:31:51 +00:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
wangyidong
967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
leiyong
df87ffddd2 * Finish task#54472. 2022-05-20 03:40:45 +00:00
李玉春
088bea319e Merge branch 'sprint/192_leiyong_task_54469' into 'master'
Sprint/192 leiyong task 54469

See merge request easycorp/zentaopms!3517
2022-05-19 07:53:10 +00:00
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
zhouxudong
0485ec15a9 * Finish task #54474. 2022-05-19 02:32:48 +00:00
zhouxudong
8ebf5a47b6 Finish task #54474. 2022-05-19 02:19:28 +00:00
zhouxudong
496adec36a * Finish task #54473. 2022-05-19 00:52:15 +00:00
zhouxudong
5b33b75d41 * Finish task #54476 #54475 #54474. 2022-05-18 10:18:02 +00:00
wangyuting2
04041e6fb5 * Fix bug #22572. 2022-05-18 09:41:15 +08:00
wangyuting2
af47d16938 * Fix bug #22573. 2022-05-18 09:27:14 +08: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