zenggang
|
8a06d71cfd
|
* Finish task#54192,54196
|
2022-05-17 07:46:52 +00:00 |
|
王怡栋
|
f27bae0fe6
|
Merge branch 'sprint/189_zg_bugs' into 'master'
* Fix bug#22451,22473,22475
See merge request easycorp/zentaopms!3390
|
2022-05-13 09:44:01 +00:00 |
|
zenggang
|
cc7f860ac0
|
* Fix bug#22451,22473,22475
|
2022-05-13 04:11:12 +00:00 |
|
孙华伟
|
183da95a35
|
*Fix bug#22454
|
2022-05-13 11:07:54 +08:00 |
|
孙广明
|
10a542cc35
|
Merge branch 'sprint/189_zenggang' into 'master'
* Fix bugs
See merge request easycorp/zentaopms!3374
|
2022-05-13 01:57:36 +00:00 |
|
zenggang
|
94bf6a70a2
|
* Adjust code
|
2022-05-13 00:44:07 +00:00 |
|
王怡栋
|
a47a3ad064
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# db/update16.5.sql
|
2022-05-12 09:09:28 +00:00 |
|
zenggang
|
e41dc21372
|
* Fix bugs
|
2022-05-12 09:06:35 +00:00 |
|
lanzongjun
|
63bd7e6902
|
* add sql
|
2022-05-12 17:04:55 +08:00 |
|
孙华伟
|
3de0b23ab8
|
*Optimize the bug.
|
2022-05-12 13:26:19 +08:00 |
|
孙华伟
|
9c2926f59a
|
*Optimize the code.
|
2022-05-12 13:23:11 +08:00 |
|
孙华伟
|
4f51081da0
|
*Fix bug#22367.
|
2022-05-12 11:03:36 +08:00 |
|
孙华伟
|
58cea27fc5
|
Update model.php
|
2022-05-12 02:16:52 +00:00 |
|
孙华伟
|
a3149121ac
|
Update model.php
|
2022-05-12 01:55:48 +00:00 |
|
孙华伟
|
b1c6976f2f
|
*Fix bug #22365.
|
2022-05-12 09:54:55 +08: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
|
a2b64debb9
|
* Adjust code
|
2022-05-11 09:24:30 +00:00 |
|
zenggang
|
0fe5a1884f
|
* Adjust code
|
2022-05-11 09:11:13 +00:00 |
|
zenggang
|
2bc6e6b468
|
* Adjust code
|
2022-05-11 09:08:18 +00:00 |
|
孙广明
|
f42cdbe8e5
|
Merge branch 'sunhuawei_task_53659' into 'master'
*Finish task #53659.
See merge request easycorp/zentaopms!3336
|
2022-05-11 08:53:12 +00:00 |
|
zenggang
|
b5093f3a1b
|
* Code for task#53657
|
2022-05-11 08:32:50 +00:00 |
|
孙华伟
|
0695047d20
|
*Finish task #53659.
|
2022-05-11 15:40:59 +08:00 |
|
wangyuting2
|
d4ed89e64a
|
* Finish task #53548.
|
2022-05-11 15:05:13 +08:00 |
|
zenggang
|
ea968e917c
|
* Adjust code
|
2022-05-11 06:11:55 +00:00 |
|
zenggang
|
d0c81c2857
|
* Adjust code
|
2022-05-11 05:51:30 +00:00 |
|
zenggang
|
a74c897ba3
|
* Adjust code
|
2022-05-11 05:11:52 +00:00 |
|
zenggang
|
d8d6ce45f7
|
* Finish task#53653
|
2022-05-10 08:58:00 +00:00 |
|
daitingting
|
e30acad1f2
|
* Add id for checking unique field.
|
2022-05-09 07:56:17 +00:00 |
|
daitingting
|
96e460c47d
|
* Finish task #53549.
|
2022-05-09 06:41:35 +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
|
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 |
|