1899 Commits

Author SHA1 Message Date
chenbo
f8bda77d0c Merge remote-tracking branch 'origin/dev' into dev 2023-11-25 10:12:36 +08:00
chenbo
7bd126f091 fixed 2023-11-25 10:10:17 +08:00
yaooo
d802ff0c75 更新小组角色 2023-11-24 14:19:26 +08:00
yaooo
93adb3d543 更新供销系统登录 2023-11-24 14:06:14 +08:00
yaooo
55aa3159ee Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-11-24 14:00:44 +08:00
yaooo
ad80574645 更新供销系统登录 2023-11-24 14:00:36 +08:00
chenbo
13ae414917 fixed 后台在任务运行中删除了任务模板,导致结算出现异常 2023-11-24 13:46:20 +08:00
chenbo
0c54ba8c34 fixed 后台在任务运行中删除了任务模板,导致结算出现异常 2023-11-24 11:58:58 +08:00
yaooo
0e7c4434ff 更新解析token 2023-11-24 10:56:19 +08:00
yaooo
d85687169d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-11-24 10:53:50 +08:00
yaooo
134765255d 更新解析token 2023-11-24 10:53:34 +08:00
chenbo
a3cdb43f1c update 镇农科公司任务改为镇合伙人公司任务 2023-11-24 10:37:22 +08:00
chenbo
6f9ef8c79f Merge remote-tracking branch 'origin/dev' into dev 2023-11-24 10:33:23 +08:00
chenbo
f327cfa298 update 镇农科公司任务改为镇合伙人公司任务 2023-11-24 10:33:11 +08:00
yaooo
9d422a2d45 新增解析中台系统token 2023-11-24 10:23:08 +08:00
mkm
1ff270db8b Merge remote-tracking branch 'origin/preview' 2023-11-22 17:35:58 +08:00
chenbo
3f791f3134 update 手动下发任务相关接口 2023-11-22 15:03:18 +08:00
chenbo
759a9d4eb5 Merge branch 'dev' into preview 2023-11-22 14:05:26 +08:00
chenbo
6926465e04 Merge remote-tracking branch 'origin/dev' into dev 2023-11-22 14:04:47 +08:00
chenbo
8357942b41 update 手动下发任务相关接口 2023-11-22 14:04:30 +08:00
weiz
e419d84b60 Merge pull request '前台登录接口增加一体机极光推送设备id参数' (#173) from zhangwei into dev
Reviewed-on: #173
2023-11-22 11:03:42 +08:00
weiz
5993ecef3c 前台登录接口增加一体机极光推送设备id参数 2023-11-22 11:01:36 +08:00
chenbo
d09758fa98 add 对接支付系统,回调改造 2023-11-21 11:15:40 +08:00
chenbo
6c44af1cf0 add 对接支付系统,回调改造 2023-11-21 10:43:26 +08:00
chenbo
78b7c8ea0a add 对接支付系统,回调改造 2023-11-21 10:40:34 +08:00
chenbo
cdde963325 fixed 2023-11-21 09:09:10 +08:00
chenbo
3d249a63ae fixed 2023-11-20 19:01:21 +08:00
chenbo
959f7d642f fixed 2023-11-20 18:23:58 +08:00
chenbo
a9b29f03e8 fixed 2023-11-20 18:04:03 +08:00
chenbo
c9d14e48cb fixed 2023-11-20 17:51:18 +08:00
chenbo
92f2abfc11 fixed 2023-11-20 17:27:40 +08:00
chenbo
d7a76319af fixed 2023-11-20 17:10:46 +08:00
chenbo
20d01ac6d9 fixed 2023-11-20 14:40:46 +08:00
chenbo
4daa667d6c up 供销对接支付系统 2023-11-20 14:21:07 +08:00
chenbo
35f6dcf591 up 供销对接支付系统 2023-11-20 13:51:40 +08:00
chenbo
cc999b400f up 供销对接支付系统 2023-11-20 12:06:19 +08:00
chenbo
a2d65de03e fixed 2023-11-20 11:01:39 +08:00
chenbo
98103e40dd fixed 2023-11-20 10:58:44 +08:00
chenbo
6d08fba3a2 fixed 2023-11-20 10:51:09 +08:00
chenbo
0c9cb2a0d7 Merge remote-tracking branch 'origin/dev' into dev 2023-11-20 10:48:55 +08:00
chenbo
04d478d880 add 供销对接支付系统 2023-11-20 10:48:44 +08:00
weiz
cd40872bc2 Merge pull request '新增公司成员对外接口' (#172) from zhangwei into dev
Reviewed-on: #172
2023-11-20 10:41:41 +08:00
yaooo
4582e4b30f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-11-20 10:36:55 +08:00
yaooo
b78ec65632 更新细节 2023-11-20 10:36:35 +08:00
chenbo
b4c6f00ffe fixed 2023-11-20 10:09:34 +08:00
weiz
75585f8e5f 新增公司成员对外接口 2023-11-20 09:42:49 +08:00
chenbo
e05552b206 fixed 负责人任务 2023-11-18 20:16:44 +08:00
chenbo
843f41c7cf fixed 协助总负责人 2023-11-18 19:29:13 +08:00
chenbo
75d34b1a84 fixed 应用软件推广 2023-11-18 18:25:17 +08:00
chenbo
2c26571b2e fixed 应用软件推广 2023-11-18 17:33:09 +08:00