 孙广明
|
507eb73497
|
Merge branch 'sprint/216_mayue_bug#25081' into 'master'
* Fix bug #25081.
See merge request easycorp/zentaopms!4473
|
2022-07-12 06:28:56 +00:00 |
|
|
mayue
|
0a5cf0a831
|
* Optimize code.
|
2022-07-12 14:28:17 +08:00 |
|
|
mayue
|
a21626979e
|
* Fix bug #25081.
|
2022-07-12 14:25:58 +08:00 |
|
|
王怡栋
|
d47cde97d2
|
Merge branch 'master_xieqiyu_25030' into 'master'
* Fix bug#25030.
See merge request easycorp/zentaopms!4464
|
2022-07-12 05:31:04 +00:00 |
|
|
zenggang
|
f3dd489f61
|
* Adjust code
|
2022-07-12 02:32:01 +00:00 |
|
|
zenggang
|
5d116c16c9
|
* Finish task#60640
|
2022-07-12 02:29:20 +00:00 |
|
|
xieqiyu
|
bd596ac686
|
* Fix bug#25030.
|
2022-07-12 09:32:31 +08:00 |
|
|
孙广明
|
107060744e
|
Merge branch 'sprint/216_mayue_task#60639' into 'master'
* Finish task #60639.
See merge request easycorp/zentaopms!4463
|
2022-07-12 00:54:34 +00:00 |
|
|
xieqiyu
|
e7d7930b5b
|
* Fix bug#25062.
|
2022-07-12 08:13:36 +08:00 |
|
|
mayue
|
9248adc1af
|
* Finish task #60639.
|
2022-07-11 18:10:09 +08:00 |
|
|
王怡栋
|
4c3d59333a
|
Merge branch 'sprint/215_liumengyi_60395' into 'master'
* Finish task #60395.
See merge request easycorp/zentaopms!4450
|
2022-07-11 07:56:19 +00:00 |
|
|
mayue
|
ea0500a20c
|
* Finish task #60641.
|
2022-07-11 15:26:14 +08:00 |
|
|
王怡栋
|
e9809af13a
|
Merge branch 'master' into 'sprint/212_hufangzhou_59535'
# Conflicts:
# www/js/my.full.js
|
2022-07-11 07:10:23 +00:00 |
|
|
hufangzhou
|
3f2b98e71c
|
* Move the functions to my.full.js file.
|
2022-07-11 15:03:40 +08:00 |
|
|
hufangzhou
|
21dbff52ca
|
* Rename method names.
|
2022-07-11 14:57:43 +08:00 |
|
|
liumengyi
|
b8642a3350
|
* Finish task #60395.
|
2022-07-11 14:49:36 +08:00 |
|
|
hufangzhou
|
2993ba53f8
|
* Finish task #59535.
|
2022-07-11 14:41:09 +08:00 |
|
|
mayue
|
88a580898d
|
* Optimize code.
|
2022-07-11 10:06:43 +08:00 |
|
|
mayue
|
5bedd02491
|
* Fix bug #25031.
|
2022-07-11 09:54:58 +08:00 |
|
|
liumengyi
|
29993afa9e
|
* Optimize code for bug #23123.
|
2022-07-08 13:55:41 +08:00 |
|
|
liumengyi
|
9921474711
|
* Fix bug #23123.
|
2022-07-08 13:43:43 +08:00 |
|
|
liumengyi
|
26b430660a
|
* Fix bug #23123.
|
2022-07-08 13:29:56 +08:00 |
|
|
孙广明
|
4049441bbe
|
* Fix linkcase bug.
|
2022-07-08 11:24:09 +08:00 |
|
|
孙广明
|
cb3651f49d
|
Merge branch 'sprint/213_mayue_task59710' into 'master'
* Finish task #59710.
See merge request easycorp/zentaopms!4430
|
2022-07-08 03:20:42 +00:00 |
|
|
孙广明
|
1f1b0b1bda
|
* Fix linkcase error.
|
2022-07-08 11:19:51 +08:00 |
|
|
孙广明
|
bcd51ec9df
|
* For code error.
|
2022-07-08 11:13:54 +08:00 |
|
|
mayue
|
7ff031bc5f
|
* Finish task #59710.
|
2022-07-08 11:13:30 +08:00 |
|
|
zenggang
|
b8c23acb69
|
* Adjust code
|
2022-07-08 01:42:17 +00:00 |
|
|
zenggang
|
a01d530a0a
|
* Hide cfd stat
|
2022-07-08 01:38:33 +00:00 |
|
|
孙广明
|
118e1f7854
|
Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban
See merge request easycorp/zentaopms!4420
|
2022-07-08 01:20:53 +00:00 |
|
|
孙广明
|
8ce405dec0
|
Merge branch 'sprint/213_mayue_bug#24848#24817' into 'master'
* Fix bug #24848#24817.
See merge request easycorp/zentaopms!4423
|
2022-07-08 01:20:09 +00:00 |
|
|
mayue
|
1df55e32a7
|
* Fix bug #24848#24817.
|
2022-07-08 09:18:53 +08:00 |
|
|
孙广明
|
6b33905ac8
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4422
|
2022-07-08 01:10:03 +00:00 |
|
|
mayue
|
f6d94ad4cb
|
* Fix bug #24848#24817.
|
2022-07-08 09:06:39 +08:00 |
|
|
孙广明
|
fc08eb2060
|
Merge branch 'fixbug_24248' into 'master'
fixbug_24248
See merge request easycorp/zentaopms!4413
|
2022-07-08 01:05:19 +00:00 |
|
|
孙广明
|
f6ed1804b3
|
Merge branch 'sprint213_zg_24761' into 'master'
* Fix bug#24761，Adjuct cfd stat
See merge request easycorp/zentaopms!4414
|
2022-07-08 01:05:07 +00:00 |
|
|
tianshujie
|
ce191b4f9e
|
* Fix bug #24945.
|
2022-07-08 09:04:57 +08:00 |
|
|
xieqiyu
|
29efcab628
|
* Code for task#59543.
|
2022-07-07 17:42:30 +08:00 |
|
|
xieqiyu
|
07231be2d2
|
* Code for task#59543.
|
2022-07-07 17:23:09 +08:00 |
|
|
zenggang
|
24b36766fb
|
* Adjuct cfd stat
|
2022-07-07 09:14:30 +00:00 |
|
|
王怡栋
|
9ef8354d1d
|
Merge branch 'sprint/211_tianshujie_fixbug' into 'master'
* Fix bug #24946.
See merge request easycorp/zentaopms!4416
|
2022-07-07 08:51:25 +00:00 |
|
|
tianshujie
|
105304ce57
|
* Fix bug #24946.
|
2022-07-07 16:18:22 +08:00 |
|
|
liumengyi
|
ef6ffd019b
|
* Fix bug of task #59480, #59481.
|
2022-07-07 15:46:36 +08:00 |
|
|
liumengyi
|
ecdd330102
|
* Fix bug of task #59480,#59481.
|
2022-07-07 14:41:10 +08:00 |
|
|
liumengyi
|
e709c4bbda
|
* Finish task #59480, #59481.
|
2022-07-07 14:12:45 +08:00 |
|
|
王怡栋
|
5dd799ee9e
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #24942, #24949.
See merge request easycorp/zentaopms!4400
|
2022-07-07 05:10:46 +00:00 |
|
|
王怡栋
|
10b95d1e48
|
Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban
See merge request easycorp/zentaopms!4398
|
2022-07-07 05:10:07 +00:00 |
|
|
孙广明
|
d02553620f
|
Merge branch 'srpint213_zg_24853' into 'master'
* Fix bug#24853
See merge request easycorp/zentaopms!4396
|
2022-07-07 02:54:25 +00:00 |
|
|
mayue
|
8192f8b185
|
* Fix bug #24811.
|
2022-07-07 10:52:45 +08:00 |
|
|
liumengyi
|
119175e5c9
|
* Fix bug #24942.
|
2022-07-07 10:28:57 +08:00 |
|