 孙广明
|
7dfc7c62fe
|
* Code for approval.
|
2022-05-14 15:14:26 +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 |
|
|
孙广明
|
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 |
|
|
mayue
|
3581e32357
|
* Fix bug #22412.
|
2022-05-13 06:14:05 +00:00 |
|
|
tanghucheng
|
5f34bfe50a
|
* Fix bug #22416.
|
2022-05-13 05:57:44 +00:00 |
|
|
李玉春
|
9771a318d5
|
Merge branch 'fix_bug' into 'master'
Fix bug
See merge request easycorp/zentaopms!3391
|
2022-05-13 05:19:58 +00:00 |
|
|
孙华伟
|
12b8250e06
|
*Fix bug #22453 #22455.
|
2022-05-13 13:17:10 +08:00 |
|
|
zenggang
|
cc7f860ac0
|
* Fix bug#22451,22473,22475
|
2022-05-13 04:11:12 +00:00 |
|
|
王怡栋
|
def7e0a5ed
|
Merge branch 'sprint/189_hufangzhou_autotest' into 'master'
* Add the auto test case for action model.
See merge request easycorp/zentaopms!3388
|
2022-05-13 03:34:22 +00:00 |
|
|
王怡栋
|
1df620e923
|
Merge branch 'sprint/daitingting_product_printextendfield' into 'master'
* Fix bug for printExtendFields in view file.
See merge request easycorp/zentaopms!3387
|
2022-05-13 03:24:53 +00:00 |
|
|
wangyidong
|
d5e9bf9dc9
|
Merge branch 'fixbug'
|
2022-05-13 11:23:34 +08:00 |
|
|
王怡栋
|
77d9a77af8
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# db/update16.5.sql
|
2022-05-13 03:21:53 +00:00 |
|
|
tanghucheng
|
da9ec2cff1
|
* Fix bug.
|
2022-05-13 03:18:32 +00:00 |
|
|
hufangzhou
|
0e6c1e24b3
|
* Add the auto test case for action model.
|
2022-05-13 11:17:32 +08:00 |
|
|
孙华伟
|
8ab8962a3f
|
*Fix bug#22453
|
2022-05-13 11:16:52 +08:00 |
|
|
tanghucheng
|
8ae4c1bcd0
|
* Fix bug.
|
2022-05-13 03:15:40 +00:00 |
|
|
daitingting
|
137b6e6417
|
* Fix bug for printExtendFields in view file.
|
2022-05-13 03:10:08 +00:00 |
|
|
孙华伟
|
183da95a35
|
*Fix bug#22454
|
2022-05-13 11:07:54 +08:00 |
|
|
tanghucheng
|
4cf1825350
|
* Fix bug.
|
2022-05-13 03:03:33 +00:00 |
|
|
孙广明
|
a6c88dc747
|
Merge branch 'sprint/unittest_liumengyi_block' into 'master'
* Add unit test of block.
See merge request easycorp/zentaopms!3385
|
2022-05-13 02:54:47 +00:00 |
|
|
liumengyi
|
731ce65bcf
|
* Add unit test of block.
|
2022-05-13 10:51:22 +08:00 |
|
|
王怡栋
|
ce0f556d48
|
Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666
See merge request easycorp/zentaopms!3384
|
2022-05-13 02:48:26 +00:00 |
|
|
孙广明
|
e427da87d5
|
Merge branch 'sprint/189_mayue_fixbug#22411' into 'master'
* Fix bug #22411.
See merge request easycorp/zentaopms!3383
|
2022-05-13 02:36:02 +00:00 |
|