 孙广明
|
7af9dc0d83
|
* Merge code.
|
2022-12-27 13:22:35 +08:00 |
|
|
liuhong
|
c018475249
|
* Fix bug for sql.
|
2022-12-27 02:24:17 +00:00 |
|
|
刘洪
|
876363eb7c
|
Merge branch 'sprint_bug_30940' into 'zentaopms_277'
* Fix bug #30940.
See merge request easycorp/zentaopms!6630
|
2022-12-26 04:17:29 +00:00 |
|
|
liuhong
|
8c1b9bf90d
|
* Fix bug #30940.
|
2022-12-26 04:15:11 +00:00 |
|
|
刘洪
|
563e737169
|
Merge branch 'sprint_bug_30899' into 'zentaopms_277'
* Fix bug #30899.
See merge request easycorp/zentaopms!6625
|
2022-12-26 02:17:22 +00:00 |
|
|
liuhong
|
81b6fec57f
|
* Fix bug #30899.
|
2022-12-26 00:53:49 +00:00 |
|
|
孙广明
|
3e9aee30f5
|
Merge branch 'sprint_bug' into 'zentaopms_277'
* Fix bug #31141 #31140.
See merge request easycorp/zentaopms!6620
|
2022-12-23 02:24:19 +00:00 |
|
|
孙广明
|
952b67636f
|
* Fix code style.
|
2022-12-22 16:33:24 +08:00 |
|
|
liuhong
|
469bd86d34
|
* Fix bug #31141 #31140.
|
2022-12-22 07:58:47 +00:00 |
|
|
孙广明
|
32fbcfaabf
|
* Fix bug #31129.
|
2022-12-22 15:22:11 +08:00 |
|
|
孙广明
|
323e4c8bbe
|
Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80491
See merge request easycorp/zentaopms!6615
|
2022-12-22 06:42:20 +00:00 |
|
|
孙广明
|
19d93a07d6
|
* Add ticket api.
|
2022-12-22 14:30:12 +08:00 |
|
|
lanzongjun
|
795dc6c13b
|
* Finish Task #80491
|
2022-12-22 10:52:01 +08:00 |
|
|
孙广明
|
9b6de26c32
|
Merge branch '277_liuhong_80489' into 'zentaopms_277'
* Finish task #80489.
See merge request easycorp/zentaopms!6613
|
2022-12-22 02:16:17 +00:00 |
|
|
孙广明
|
8769553d1a
|
Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80486
See merge request easycorp/zentaopms!6614
|
2022-12-22 02:14:53 +00:00 |
|
|
lanzongjun
|
9b9670acd9
|
* Finish Task #80486
|
2022-12-22 10:12:01 +08:00 |
|
|
liuhong
|
fca70f5855
|
* Code for task #80849.
|
2022-12-22 01:33:04 +00:00 |
|
|
liuhong
|
f1baa412b1
|
* Finish task #80489.
|
2022-12-22 00:51:38 +00:00 |
|
|
孙广明
|
e527505eb4
|
Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80474
See merge request easycorp/zentaopms!6611
|
2022-12-21 08:26:24 +00:00 |
|
|
lanzongjun
|
a0c3ad9f03
|
* Finish Task #80474
|
2022-12-21 16:02:01 +08:00 |
|
|
孙广明
|
b3e194065b
|
* Add upgrade sql.
|
2022-12-21 10:59:05 +08:00 |
|
|
孙广明
|
57cdd90174
|
Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80491
See merge request easycorp/zentaopms!6605
|
2022-12-21 02:45:49 +00:00 |
|
|
lanzongjun
|
73b44f6bdd
|
* Finish Task #80491
|
2022-12-20 18:03:52 +08:00 |
|
|
lanzongjun
|
80c4c018ba
|
Merge branch 'zentaopms_277' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms277_lanzongjun
|
2022-12-20 15:57:19 +08:00 |
|
|
孙广明
|
ce11636819
|
Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #80475
See merge request easycorp/zentaopms!6601
|
2022-12-20 05:53:43 +00:00 |
|
|
lanzongjun
|
f43487d870
|
Merge branch 'zentaopms_277' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms277_lanzongjun
|
2022-12-20 11:04:35 +08:00 |
|
|
lanzongjun
|
7df0a42da7
|
* Finish Task #80475
|
2022-12-20 11:03:41 +08:00 |
|
|
xieqiyu
|
e5e8ecaa68
|
* Code for task#80490.
|
2022-12-19 16:05:17 +08:00 |
|
|
胡方舟
|
9ff12a3a07
|
Merge branch 'fix_local_upgrade' into 'master'
- Remove useless code for local upgrade.
See merge request easycorp/zentaopms!6589
|
2022-12-19 02:56:25 +00:00 |
|
|
Lufei
|
9ca8e975c3
|
- Remove useless code for local upgrade.
|
2022-12-19 10:55:05 +08:00 |
|
|
胡方舟
|
ed83ba0142
|
Merge branch 'bugfix/liwenrui/zentaoxxmake' into 'master'
* fix makefile for zentaoxx.
See merge request easycorp/zentaopms!6587
|
2022-12-19 01:54:03 +00:00 |
|
|
文睿 李
|
098954ef7d
|
* fix makefile for zentaoxx.
|
2022-12-19 01:52:37 +00:00 |
|
|
王怡栋
|
ceb821579a
|
Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize word.
See merge request easycorp/zentaopms!6586
|
2022-12-19 00:59:26 +00:00 |
|
|
孔令茂
|
5de767bed3
|
* Optimize word.
|
2022-12-17 14:06:27 +00:00 |
|
|
孙广明
|
aedf34e7dc
|
Merge branch 'master_xieqiyu_30291' into 'master'
* Fix bug#30291.
See merge request easycorp/zentaopms!6585
|
2022-12-16 08:22:35 +00:00 |
|
|
孙广明
|
a5a440f62e
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug
See merge request easycorp/zentaopms!6584
|
2022-12-16 07:55:58 +00:00 |
|
|
xieqiyu
|
d0fb46062d
|
* Fix bug#30291.
|
2022-12-16 15:55:54 +08:00 |
|
|
lanzongjun
|
cbe351104a
|
* Fix Bug
|
2022-12-16 15:55:01 +08:00 |
|
|
孙广明
|
a84250c27b
|
Merge branch 'bugfix/liwenrui/defaultbottweak' into 'master'
修复喧喧机器人所用语言项
See merge request easycorp/zentaopms!6581
|
2022-12-16 07:09:40 +00:00 |
|
|
孙广明
|
6fe0374751
|
Merge branch 'master_xieqiyu_30855' into 'master'
* Fix bug#30855.
See merge request easycorp/zentaopms!6582
|
2022-12-16 07:09:28 +00:00 |
|
|
孙广明
|
4c98d0cd33
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30957
See merge request easycorp/zentaopms!6583
|
2022-12-16 07:09:02 +00:00 |
|
|
lanzongjun
|
febbe41e69
|
* Fix Bug #30957
|
2022-12-16 15:01:38 +08:00 |
|
|
xieqiyu
|
af8cf547ea
|
* Fix bug#30855.
|
2022-12-16 14:52:42 +08:00 |
|
|
Wenrui LI
|
a0e733cd12
|
* update xuan release ref.
|
2022-12-16 14:49:03 +08:00 |
|
|
Wenrui LI
|
293b9146bc
|
* use correct lang for client status.
|
2022-12-16 14:48:52 +08:00 |
|
|
孙广明
|
1bfeab6584
|
Merge branch 'sprint/hufangzhou_feature_deleteBI' into 'master'
* Remove the bi's info from the version.
See merge request easycorp/zentaopms!6578
|
2022-12-16 06:34:28 +00:00 |
|
|
孙广明
|
4369fcda5a
|
Merge branch 'master_xieqiyu_30583' into 'master'
* Fix bug#30583.
See merge request easycorp/zentaopms!6579
|
2022-12-16 06:34:17 +00:00 |
|
|
孙广明
|
18597ae994
|
Merge branch 'bugfix/liwenrui/botloadmodel' into 'master'
修复客户端中机器人 model 加载问题
See merge request easycorp/zentaopms!6580
|
2022-12-16 06:34:03 +00:00 |
|
|
Wenrui LI
|
49d0c7e674
|
* fix search user on default bot.
|
2022-12-16 14:30:35 +08:00 |
|
|
xieqiyu
|
61e41379be
|
* Fix bug#30583.
|
2022-12-16 14:23:21 +08:00 |
|