1233 Commits

Author SHA1 Message Date
chenbo
f37e5b3ec2 押金充值对公账号转账临时方案-前端代码 2023-10-18 09:05:37 +08:00
chenbo
9dcf86558a fixed:公司余额字段 2023-10-17 17:12:38 +08:00
chenbo
dd3ca501d8 add:押金充值对公账户临时方案-前端代码 2023-10-17 16:16:07 +08:00
chenbo
9c2aa1b1ca add:押金充值对公账户临时方案 2023-10-17 15:34:20 +08:00
chenbo
eb5607bfe4 add:押金充值对公账户临时方案 2023-10-17 14:14:45 +08:00
chenbo
22ed2105fb add:押金充值线上转账对公账户临时方案 2023-10-13 18:16:37 +08:00
mkm
133e14c9eb Merge pull request 'fixed:App端任务列表接口和充值记录列表接口' () from master-fix-1013 into master
Reviewed-on: 
2023-10-13 13:33:26 +08:00
chenbo
1bf17d0eba fixed:App端任务列表接口和充值记录列表接口 2023-10-13 11:51:44 +08:00
mkm
001f8016ca Merge pull request 'preview' () from preview into master
Reviewed-on: 
2023-10-09 16:43:25 +08:00
mkm
feddbb5596 Merge pull request 'dev' () from dev into preview
Reviewed-on: 
2023-10-09 16:43:04 +08:00
weiz
e62e2c0f57 Merge pull request '增加极光消息推送' () from zhangwei into dev
Reviewed-on: 
2023-10-09 12:02:02 +08:00
unknown
4be9d200b6 增加极光消息推送 2023-10-09 12:00:50 +08:00
weiz
63d91277f1 Merge pull request '增加消息唯一标识字段' () from zhangwei into dev
Reviewed-on: 
2023-10-09 09:45:49 +08:00
unknown
a05bdfc5cb 增加消息唯一标识字段 2023-10-09 09:45:15 +08:00
weiz
ff98621819 Merge pull request 'fixed' () from zhangwei into dev
Reviewed-on: 
2023-10-09 09:44:24 +08:00
chenbo
c489f0874c Merge remote-tracking branch 'origin/dev' into dev 2023-10-08 18:16:03 +08:00
chenbo
2d9f2977ea update:编辑公司-更改了公司类型,则更改公司后台账号和前台账号的角色,以及任务安排 2023-10-08 18:15:53 +08:00
unknown
47c9719d45 fixed 2023-10-08 17:44:36 +08:00
weiz
d7e8f30c00 Merge pull request 'fixed' () from zhangwei into dev
Reviewed-on: 
2023-10-08 17:39:17 +08:00
unknown
bc034972d8 fixed 2023-10-08 17:38:45 +08:00
chenbo
dd7e99cc07 Merge remote-tracking branch 'origin/dev' into dev 2023-10-08 17:36:31 +08:00
chenbo
7e9a1e44fe update:前端打包代码 2023-10-08 17:36:09 +08:00
mkm
0326355acc Merge pull request 'preview' () from preview into master
Reviewed-on: 
2023-10-08 16:10:25 +08:00
weiz
ef88ea44c2 Merge pull request '取消文件上传大小限制' () from zhangwei into dev
Reviewed-on: 
2023-10-08 15:22:41 +08:00
unknown
3b72cefd38 取消文件上传大小限制 2023-10-08 15:22:08 +08:00
weiz
376c4c4d01 Merge pull request '用户列表最后消息更新' () from zhangwei into dev
Reviewed-on: 
2023-10-08 14:51:19 +08:00
unknown
cfa10d4c50 用户列表最后消息更新 2023-10-08 14:50:19 +08:00
weiz
ee2df3b62e Merge pull request '消息列表中增加用户信息' () from zhangwei into dev
Reviewed-on: 
2023-10-08 14:48:23 +08:00
chenbo
2914c511ee Merge pull request 'dev' () from dev into preview
Reviewed-on: 
2023-10-08 14:07:14 +08:00
chenbo
781c4e4968 update:前端打包代码 2023-10-08 14:04:41 +08:00
chenbo
141b8c2cd8 update:镇农科任务分角色查看自己的任务列表 2023-10-08 11:56:20 +08:00
chenbo
a57282c551 紧急修复接口 2023-10-08 10:34:57 +08:00
chenbo
dc130190d3 update 2023-10-08 10:03:45 +08:00
unknown
fd4a3be3ee 消息列表中增加用户信息 2023-10-08 09:14:39 +08:00
chenbo
7a109d30f4 Merge pull request 'dev' () from dev into preview
Reviewed-on: 
2023-10-07 17:51:42 +08:00
chenbo
4ef6554994 fixed 2023-10-07 17:49:21 +08:00
chenbo
a15fef8584 Merge remote-tracking branch 'origin/dev' into dev 2023-10-07 17:35:38 +08:00
chenbo
9c3bd3c890 add 任务下发和任务结算线上事故紧急修复接口 2023-10-07 17:30:32 +08:00
mkm
583e998416 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into preview 2023-10-07 17:14:04 +08:00
mkm
166b1600f0 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm 2023-10-07 17:12:57 +08:00
mkm
ab366cd69c 更新 2023-10-07 17:12:43 +08:00
chenbo
432b64fd72 Merge remote-tracking branch 'origin/dev' into dev 2023-10-07 17:05:12 +08:00
chenbo
b2257a85cb fixed 任务结算是结算当天的任务 2023-10-07 17:04:58 +08:00
weiz
df34910a5c Merge pull request '修复消息列表查询结果' () from zhangwei into dev
Reviewed-on: 
2023-10-07 16:06:06 +08:00
unknown
ece05b9859 修复消息列表查询结果 2023-10-07 16:04:47 +08:00
weiz
7b0af59720 Merge pull request 'update' () from zhangwei into dev
Reviewed-on: 
2023-10-07 11:30:57 +08:00
unknown
fb79526c42 update 2023-10-07 11:30:10 +08:00
weiz
cb976433ce Merge pull request 'patch' () from zhangwei into dev
Reviewed-on: 
2023-10-07 11:28:42 +08:00
unknown
60c7a6f32b patch 2023-10-07 10:53:08 +08:00
weiz
5b475d66d0 Merge pull request 'add getAreaManager method' () from zhangwei into dev
Reviewed-on: 
2023-10-07 09:48:14 +08:00