 朱金勇
|
9c0e752948
|
Merge branch 'fixbug_wangxiaomeng#21650' into 'master'
fixbug_21650.
See merge request easycorp/zentaopms!3062
|
2022-04-22 01:37:26 +00:00 |
|
|
朱金勇
|
d17a38d658
|
Merge branch 'sprint/sunhao/optimize_picker_in_search' into 'master'
* fix picker control not initialized in search form.
See merge request easycorp/zentaopms!3039
|
2022-04-21 08:37:25 +00:00 |
|
|
wangxiaomeng
|
8cec8ea0bd
|
fixbug_21650.
|
2022-04-21 16:00:44 +08:00 |
|
|
Hao Sun
|
f0c120373f
|
* fix picker control not initialized in search form.
|
2022-04-20 20:39:04 +08:00 |
|
|
朱金勇
|
17dbbe5401
|
Merge branch 'fixbug_wangxiaomeng_#21773_#21650' into 'master'
Fixbug wangxiaomeng #21773 ,21650.
See merge request easycorp/zentaopms!2990
|
2022-04-20 07:56:24 +00:00 |
|
|
wangxiaomeng
|
b635d1bf59
|
fixbug_21650 edit getByID.
|
2022-04-20 15:55:24 +08:00 |
|
|
wangxiaomeng
|
821413f1c4
|
fixbug_21650 edit getByID.
|
2022-04-20 09:10:03 +08:00 |
|
|
wangxiaomeng
|
c18bceef35
|
Hidden Comment
|
2022-04-19 08:17:54 +08:00 |
|
|
zenggang
|
1c8c50724d
|
* Fix bug#18642,21572
|
2022-04-18 07:25:46 +00:00 |
|
|
wangxiaomeng
|
230851d903
|
fix_bug_#21773
|
2022-04-18 15:16:01 +08:00 |
|
|
wangxiaomeng
|
82a5ef9a66
|
fix_bug_#21773.
|
2022-04-18 14:56:48 +08:00 |
|
|
wangxiaomeng
|
6c6ff205cf
|
fixbug_#21650,21773.
|
2022-04-18 14:52:18 +08:00 |
|
|
王怡栋
|
26f19a6085
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-15 11:20:54 +08:00 |
|
|
王怡栋
|
b9ebcd6944
|
* code for bug #21655.
|
2022-04-15 11:20:28 +08:00 |
|
|
hufangzhou
|
b79247398e
|
* Fix bug #20174.
|
2022-04-14 10:04:48 +08:00 |
|
|
hufangzhou
|
7d807a5694
|
* Fix bug #19789.
|
2022-04-11 14:40:07 +08:00 |
|
|
zenggang
|
badb961a37
|
* Adjust code
|
2022-04-06 06:27:49 +00:00 |
|
|
zenggang
|
6cdf575678
|
* Adjust code
|
2022-04-06 06:07:46 +00:00 |
|
|
zenggang
|
4b87e07830
|
* Finish task#51071
|
2022-04-06 04:16:24 +00:00 |
|
|
tanghucheng
|
15e6262065
|
* Fix bug #20329,20350,20366.
|
2022-03-07 16:42:58 +08:00 |
|
|
mayue
|
1d46d36aed
|
* Optimize code.
|
2022-03-01 15:09:11 +08:00 |
|
|
mayue
|
8fe8034cf4
|
* Fix bug#20175.
|
2022-03-01 14:15:21 +08:00 |
|
|
孙广明
|
3627387370
|
Merge branch 'sprint/185_mayue_49285' into 'sprint/185'
* Finish task#49285.
See merge request easycorp/zentaopms!1871
|
2022-02-25 06:32:20 +00:00 |
|
|
mayue
|
37a9564c95
|
* Optimize code.
|
2022-02-25 14:20:37 +08:00 |
|
|
mayue
|
c3ef97bf47
|
* Optimize code.
|
2022-02-25 14:15:25 +08:00 |
|
|
mayue
|
245542e972
|
* Optimize code.
|
2022-02-25 14:00:54 +08:00 |
|
|
孙广明
|
7ba3ed1dfc
|
Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.
See merge request easycorp/zentaopms!1980
|
2022-02-25 05:26:24 +00:00 |
|
|
mayue
|
c763f12188
|
* Optimize code.
|
2022-02-25 13:20:18 +08:00 |
|
|
zhengrunyu
|
b641170d85
|
* Fix bug 19941 19923 19922 19787.
|
2022-02-25 11:01:31 +08:00 |
|
|
liumengyi
|
9bd39c1e98
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:44:11 +08:00 |
|
|
liumengyi
|
e0814cd74b
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:15:08 +08:00 |
|
|
zhujinyong
|
408f8d4d91
|
* Move die to return.
|
2022-02-22 14:15:00 +08:00 |
|
|
mayue
|
6c2c72ff66
|
* Finish task#49285.
|
2022-02-17 17:38:59 +08:00 |
|
|
李玉春
|
62097d0731
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49286'
# Conflicts:
# db/update16.4.sql
|
2022-02-17 07:23:41 +00:00 |
|
|
zhengrunyu
|
3dbbc4b3f0
|
*Finish task 49286.
|
2022-02-17 15:02:18 +08:00 |
|
|
zhengrunyu
|
5083af2323
|
*Finish task 49286.
|
2022-02-17 10:47:56 +08:00 |
|
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
|
周旭东
|
3dc987e3ca
|
Update index.css
|
2022-02-15 00:21:17 +00:00 |
|
|
周旭东
|
95d10fc182
|
Update index.css
|
2022-02-14 09:04:02 +00:00 |
|
|
zhouxudong
|
c8bfc2716b
|
*Fix bug #48844.
|
2022-02-14 16:42:58 +08:00 |
|
|
tanghucheng
|
954f96147c
|
* Adjust for search.
|
2022-01-24 10:52:19 +08:00 |
|
|
hufangzhou
|
a49076b0d8
|
* Fix bug #18407.
|
2022-01-17 10:14:50 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
王怡栋
|
57c6ae78a8
|
* adjust for search.
|
2021-11-24 14:24:35 +08:00 |
|
|
liyuchun
|
d8c96a6430
|
* Fix bug #15867.
|
2021-11-01 16:13:13 +08:00 |
|
|
zenggang
|
c061aac0e1
|
* Adjust code style
|
2021-10-28 07:56:24 +00:00 |
|
|
zenggang
|
9096f80059
|
* Fix bug#15773
|
2021-10-28 02:34:20 +00:00 |
|
|
hufangzhou
|
bf78fe9be4
|
* Add the 15.6 version and upgrade.
|
2021-10-12 09:35:39 +08:00 |
|
|
王怡栋
|
88a5c5d207
|
* fix loophole.
|
2021-10-08 10:35:38 +08:00 |
|
|
tianshujie
|
4f977efaeb
|
* Finish task #42854.
|
2021-09-28 13:14:32 +08:00 |
|