Commit Graph
191 Commits
Author SHA1 Message Date
wangyidong 16663dee7f * fix bug #24818. 2022-07-06 17:17:28 +08:00
lanzongjun d6a387935f * fix bug #24813 2022-07-06 14:44:36 +08:00
wangyidong 18c2a6e80e * code for bug #24758. 2022-07-05 16:57:34 +08:00
liyuchun 9c675ceb6b * Fix error. 2022-06-15 08:12:42 +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
朱金勇 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 821413f1c4 fixbug_21650 edit getByID. 2022-04-20 09:10:03 +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
王怡栋 b9ebcd6944 * code for bug #21655. 2022-04-15 11:20:28 +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
mayue c763f12188 * Optimize code. 2022-02-25 13:20:18 +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 5083af2323 *Finish task 49286. 2022-02-17 10:47:56 +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
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
zenggang f495f058ed * Finish task#42421,42411,42409,42403,42392,42388,42386,42374 2021-09-08 15:31:11 +08:00
tianshujie98 7a41616a14 * Fix bug #14590. 2021-08-24 14:08:54 +08:00
tianshujie98 a6ce38ef9c * Finish task #41751. 2021-08-23 15:54:03 +08:00
zenggang d793c67789 * Finish task #41482 2021-08-19 15:40:55 +08:00
qiyu-xie 28a76ef739 * Finish task#41599. 2021-08-18 15:50:37 +08:00
王怡栋 3f69110edc * adjust for fulltext search. 2021-08-13 14:08:10 +08:00
王怡栋 f5caade0e4 * fix bug for fulltext search and action. 2021-08-11 13:57:55 +08:00
wangyidong 047780db1c * finish task #40901. 2021-08-03 17:21:53 +08:00
wangyidong 1445f18e14 * finish task #40901. 2021-08-03 16:37:48 +08:00
wangyidong f46c5f5072 * fix for save index. 2021-07-29 16:12:41 +08:00
wangyidong 0a131fe8db * finish task #40432. 2021-07-29 15:12:10 +08:00
wangyidong 42588eabfe * adjust for flow. 2021-07-27 13:32:09 +08:00
tianshujie98 8c6f5898ea * Fix an error. 2021-07-13 15:00:40 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00