 tanghucheng
|
0c3eb1a759
|
* Fix bug for sql.
|
2022-05-16 02:44:03 +00:00 |
|
|
李玉春
|
4d086ec901
|
Merge branch 'sprint/tianshujie_bug22489' into 'master'
* Fix bug #22489.
See merge request easycorp/zentaopms!3409
|
2022-05-16 01:27:47 +00:00 |
|
|
tianshujie
|
bc694cb2f4
|
* Delete extra blank lines.
|
2022-05-16 09:24:58 +08:00 |
|
|
tianshujie
|
aaea60f6ad
|
* Fix bug #22489.
|
2022-05-16 09:13:18 +08:00 |
|
|
朱金勇
|
f6bad14832
|
Merge branch 'sprint/189_hufangzhou_refer' into 'master'
* Fix the bug of login failed.
See merge request easycorp/zentaopms!3408
|
2022-05-16 01:04:08 +00:00 |
|
|
hufangzhou
|
5b20d429b4
|
* Fix the bug of login failed.
|
2022-05-16 09:03:13 +08:00 |
|
|
王怡栋
|
9bc0b237e4
|
Merge branch 'master_xieqiyu_22409' into 'master'
* Fix bug#22409.
See merge request easycorp/zentaopms!3389
|
2022-05-16 00:59:34 +00:00 |
|
|
孙广明
|
d4bc3efcbf
|
Merge branch 'testcase_zhouxin_3' into 'master'
Add testcase.
See merge request easycorp/zentaopms!3406
|
2022-05-16 00:53:58 +00:00 |
|
|
zhouxin
|
9556bc3e9b
|
Adjust code.
|
2022-05-16 00:51:58 +00:00 |
|
|
孙广明
|
b2dc18e4ac
|
Merge branch 'zg_unit' into 'master'
* Program getlist method unit
See merge request easycorp/zentaopms!3401
|
2022-05-16 00:51:05 +00:00 |
|
|
孙广明
|
659a967bd1
|
Merge branch 'sprint/tianshujie_case' into 'master'
Sprint/tianshujie case
See merge request easycorp/zentaopms!3403
|
2022-05-16 00:50:42 +00:00 |
|
|
zhouxin
|
24e2138aef
|
Add testcase.
|
2022-05-16 00:46:04 +00:00 |
|
|
zenggang
|
e1307f1dc7
|
* Adjust code
|
2022-05-16 00:36:40 +00:00 |
|
|
李玉春
|
8dc60251fc
|
Merge branch 'sprint/189_liumengyi_fixbug' into 'master'
* Fix bug for update.
See merge request easycorp/zentaopms!3405
|
2022-05-16 00:30:19 +00:00 |
|
|
liumengyi
|
235c9b071f
|
* Fix bug for update.
|
2022-05-16 08:28:28 +08:00 |
|
|
xieqiyu
|
8c50568213
|
* Restore the code of task#53671.
|
2022-05-15 21:28:31 +08:00 |
|
|
朱金勇
|
15a3e584f8
|
Merge branch 'sgm_approval' into 'master'
* Code for approval.
See merge request easycorp/zentaopms!3404
|
2022-05-15 02:13:33 +00:00 |
|
|
zhujinyong
|
9efef2692b
|
+ Add no-referrer.
|
2022-05-14 16:47:44 +08:00 |
|
|
孙广明
|
7dfc7c62fe
|
* Code for approval.
|
2022-05-14 15:14:26 +08:00 |
|
|
tianshujie
|
ad49931b1d
|
* Add testcase of block module.
|
2022-05-13 22:32:17 +08:00 |
|
|
王怡栋
|
7dc27f4c95
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #22417#22413
See merge request easycorp/zentaopms!3398
|
2022-05-13 09:55:23 +00:00 |
|
|
lanzongjun
|
50487724dc
|
* modify code for sql
|
2022-05-13 17:53:29 +08: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 |
|
|
王怡栋
|
3f7611c365
|
Merge branch 'fixbug' into 'master'
* Fix bug #22416.
See merge request easycorp/zentaopms!3393
|
2022-05-13 09:40:39 +00:00 |
|
|
lanzongjun
|
20042e3de0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-05-13 17:40:10 +08:00 |
|
|
李玉春
|
d53b7da921
|
Merge branch 'mayue_fix_apibug' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!3402
|
2022-05-13 09:39:10 +00:00 |
|
|
mayue
|
5f936b6274
|
* Optimize code.
|
2022-05-13 09:37:27 +00:00 |
|
|
孙广明
|
3bea91aa8d
|
Merge branch 'fix_bug' into 'master'
*Fix bug #22397.
See merge request easycorp/zentaopms!3397
|
2022-05-13 09:34:14 +00:00 |
|
|
tanghucheng
|
8313a0a404
|
* Fix bug #22416.
|
2022-05-13 09:33:25 +00:00 |
|
|
孙华伟
|
2a33fd3830
|
*Fix bug.
|
2022-05-13 17:32:26 +08:00 |
|
|
孙华伟
|
fc63dceb72
|
*Optimize the code.
|
2022-05-13 17:29:44 +08:00 |
|
|
孙华伟
|
c8d4a93bbf
|
*Optemizi the code
|
2022-05-13 17:28:39 +08:00 |
|
|
zenggang
|
3dc56ad3e2
|
* Program getlist method unit
|
2022-05-13 09:23:46 +00:00 |
|
|
孙广明
|
80d4d784af
|
Merge branch 'sprint/scx_closefeedback' into 'master'
* Fix bug #22261.
See merge request easycorp/zentaopms!3375
|
2022-05-13 08:24:11 +00:00 |
|
|
lanzongjun
|
9b1ef72837
|
* fix bug #22413
|
2022-05-13 16:23:55 +08:00 |
|
|
孙广明
|
0474789c6b
|
Merge branch 'mayue_fix_apibug' into 'master'
* Fix api bug.
See merge request easycorp/zentaopms!3400
|
2022-05-13 08:23:49 +00:00 |
|
|
lanzongjun
|
2d4b0ad2b3
|
* fix bug #22413
|
2022-05-13 16:23:43 +08:00 |
|
|
mayue
|
025238c3d8
|
* Fix api bug.
|
2022-05-13 08:17:12 +00:00 |
|
|
lanzongjun
|
9f1a8e958e
|
* fix bug #22413
|
2022-05-13 14:59:04 +08:00 |
|
|
孙广明
|
a7f317c6e2
|
Merge branch 'sprint/unittest_liumengyi_block' into 'master'
* Add unit test of block save.
See merge request easycorp/zentaopms!3399
|
2022-05-13 06:54:24 +00:00 |
|
|
liumengyi
|
ebf8b3cbd8
|
* Add init of save().
|
2022-05-13 14:53:29 +08:00 |
|
|
liumengyi
|
f6084050ae
|
* Add unit test of block save.
|
2022-05-13 14:50:58 +08:00 |
|
|
lanzongjun
|
2309a35d86
|
* fix bug #22417
|
2022-05-13 14:48:34 +08:00 |
|
|
孙华伟
|
bf29f5e61e
|
*Fix bug #22397.
|
2022-05-13 14:47:13 +08:00 |
|
|
王怡栋
|
1927af786c
|
Merge branch 'master_xieqiyu_unittest' into 'master'
Master xieqiyu unittest
See merge request easycorp/zentaopms!3395
|
2022-05-13 06:40:09 +00:00 |
|
|
李玉春
|
a3c63501f9
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #22483.
See merge request easycorp/zentaopms!3396
|
2022-05-13 06:30:08 +00:00 |
|
|
孙广明
|
4d3cff9962
|
Merge branch 'sprint/189_mayue_fixbug#22412' into 'master'
* Fix bug #22412.
See merge request easycorp/zentaopms!3394
|
2022-05-13 06:25:31 +00:00 |
|
|
mayue
|
156ebf701f
|
* Optimize code.
|
2022-05-13 06:22:39 +00:00 |
|
|
wangyidong
|
12b811e4b4
|
* adjust for workflow field.
|
2022-05-13 14:19:54 +08:00 |
|
|
tianshujie
|
eb7b7d92c4
|
* Fix bug #22483.
|
2022-05-13 14:17:13 +08:00 |
|