TaskSystem

mkm/TaskSystem

Fork 0

Commit Graph

Select branches

Hide Pull Requests

chenbo_dev

dev

dev_1201_newpay

dev_task

dev_towntask

feature

master

master-yajin-feature

master_旧

mkm

mkm-2

preview

zhangwei

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

ae32006a6e update chenbo 2023-09-11 10:27:13 +08:00
6107e53b14 update chenbo 2023-09-11 10:20:46 +08:00
a21b8f5471 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-11 09:48:28 +08:00
e56acef076 update chenbo 2023-09-11 09:47:21 +08:00
d67775625c Merge pull request '更新' (#55) from mkm into dev mkm 2023-09-09 22:02:12 +08:00
2c95c0b8e3 更新 shengchanzhe 2023-09-09 22:00:39 +08:00
b3648c544b Merge pull request 'update notify' (#54) from zhangwei into dev weiz 2023-09-09 20:32:48 +08:00
25228c773f update notify unknown 2023-09-09 20:29:10 +08:00
d1b2294e0c Merge pull request 'update notify' (#53) from zhangwei into dev weiz 2023-09-09 20:21:02 +08:00
a7c5bd3390 update:公司提现改造,app端新增用户当前可提现金额接口，后台新增提现审核接口，根据周期内可提现金额做扣除公司金额和用户金额。 chenbo 2023-09-09 20:18:18 +08:00
b53cb00c05 update notify unknown 2023-09-09 20:15:50 +08:00
deb4b80b74 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-09 20:00:03 +08:00
ce599e76a4 update:公司提现改造,app端新增用户当前可提现金额接口，后台新增提现审核接口，根据周期内可提现金额做扣除公司金额和用户金额。 chenbo 2023-09-09 19:59:50 +08:00
9bd0e35933 Merge pull request 'update admin page' (#52) from zhangwei into dev weiz 2023-09-09 19:02:07 +08:00
aa30d9c6f2 update admin page unknown 2023-09-09 19:01:16 +08:00
373146e186 Merge pull request '修复三轮车发送合同回调' (#51) from zhangwei into dev weiz 2023-09-09 18:59:29 +08:00
5ed3fa839e 修复三轮车发送合同回调 unknown 2023-09-09 18:58:57 +08:00
f671f8c80d Merge pull request 'mkm' (#50) from mkm into dev mkm 2023-09-09 17:23:22 +08:00
9000fc82bd 修改查询 shengchanzhe 2023-09-09 17:22:40 +08:00
2b8d1e8e02 提交 mkm 2023-09-09 15:52:44 +08:00
0b933e9201 Merge pull request '修复三轮车发送合同回调' (#49) from zhangwei into dev weiz 2023-09-09 14:59:26 +08:00
812c27f721 修复三轮车发送合同回调 unknown 2023-09-09 14:58:56 +08:00
7a7ab841d3 Merge pull request 'patch' (#48) from zhangwei into dev weiz 2023-09-09 14:35:36 +08:00
7d13753dd9 patch unknown 2023-09-09 14:35:02 +08:00
24c0ff21a0 Merge pull request 'update' (#47) from zhangwei into dev weiz 2023-09-09 14:19:52 +08:00
815b1a3b4b update unknown 2023-09-09 14:19:07 +08:00
d1fcdb60c2 Merge pull request 'update' (#46) from zhangwei into dev weiz 2023-09-09 13:48:38 +08:00
d978c41284 update unknown 2023-09-09 13:47:32 +08:00
a318dedf31 Merge pull request 'pc页面' (#45) from mkm into dev mkm 2023-09-09 12:51:04 +08:00
492039d3c9 pc页面 mkm 2023-09-09 12:49:21 +08:00
b858c543cd Merge pull request '修复错误' (#44) from mkm into dev mkm 2023-09-09 12:03:53 +08:00
83279b2b87 修复错误 mkm 2023-09-09 12:03:40 +08:00
e60058908b Merge pull request 'url错误' (#43) from mkm into dev mkm 2023-09-09 11:58:13 +08:00
21944f9987 url错误 mkm 2023-09-09 11:57:56 +08:00
2e59a94c30 Merge pull request '修复错误' (#42) from mkm into dev mkm 2023-09-09 11:57:02 +08:00
4a5cf12d4f 修复错误 mkm 2023-09-09 11:56:29 +08:00
b1f0f7a4c6 Merge pull request '新增签约证据保存' (#41) from zhangwei into dev weiz 2023-09-09 11:55:48 +08:00
d3a488889b 新增签约证据保存 unknown 2023-09-09 11:55:06 +08:00
569998ef8d Merge pull request 'mkm' (#40) from mkm into dev mkm 2023-09-09 11:47:15 +08:00
6bc993466a Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm mkm 2023-09-09 11:46:56 +08:00
26183f80f8 更新 mkm 2023-09-09 11:42:46 +08:00
509eb4cd17 封装人脸检验上传请求参数类 chenbo 2023-09-09 11:19:38 +08:00
fe040f1575 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm mkm 2023-09-09 11:07:41 +08:00
4532cfabcf 修复结算错误 mkm 2023-09-09 09:46:59 +08:00
e0f5fb24fe Merge pull request '修复合同列表页出现Attempt to read property "area_manager" on null的错误' (#39) from zhangwei into dev weiz 2023-09-09 09:32:21 +08:00
ca645a26fa 修复合同列表页出现Attempt to read property "area_manager" on null的错误 unknown 2023-09-09 09:31:26 +08:00
ce44bef03d 注释签约时需要人脸验证的参数 chenbo 2023-09-09 09:09:06 +08:00
cd910e865d Merge branch 'master' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm mkm 2023-09-09 09:08:49 +08:00
867c41ef6b Merge pull request '更新 app/api/controller/TaskController.php' (#38) from mkm-2 into master mkm 2023-09-08 22:54:34 +08:00
5909269f33 更新 app/api/controller/TaskController.php mkm-2 mkm 2023-09-08 22:54:17 +08:00
5d843aaf2d Merge pull request 'mkm-2' (#37) from mkm-2 into master mkm 2023-09-08 21:32:28 +08:00
217ec57a73 更新 app/api/controller/RemoteController.php mkm 2023-09-08 21:31:55 +08:00
00d3998750 更新 app/api/lists/AccountLogLists.php mkm 2023-09-08 21:30:47 +08:00
7e4931803e 更新 app/api/controller/TaskController.php mkm 2023-09-08 21:29:35 +08:00
18d8f28a90 更新 app/job/TaskInformationJob.php mkm 2023-09-08 21:28:39 +08:00
dd8e07a5a4 注释人脸相关代码 chenbo 2023-09-08 21:24:15 +08:00
460b2fd29c 注释人脸相关代码 chenbo 2023-09-08 21:21:22 +08:00
5a936741dc 注释人脸相关代码 chenbo 2023-09-08 21:20:13 +08:00
6f9f49bf79 注释人脸相关代码 chenbo 2023-09-08 21:16:13 +08:00
8439c01d8f debug chenbo 2023-09-08 21:06:29 +08:00
cb1aa2394c debug chenbo 2023-09-08 20:55:33 +08:00
8aeec78739 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-08 20:51:07 +08:00
986c91ee93 debug chenbo 2023-09-08 20:50:58 +08:00
ecf33dfec1 Merge pull request '修正结算逻辑' (#36) from mkm into dev mkm 2023-09-08 20:29:03 +08:00
7862dbdac0 修正结算逻辑 mkm 2023-09-08 20:27:52 +08:00
45c2c10fea Merge pull request '获取签约证据' (#35) from zhangwei into dev weiz 2023-09-08 19:19:40 +08:00
0f54f56a4d 获取签约证据 unknown 2023-09-08 19:18:44 +08:00
71c56c0718 Merge pull request 'mkm' (#34) from mkm into dev mkm 2023-09-08 18:30:30 +08:00
92bf30831f 更新查询 mkm 2023-09-08 18:29:04 +08:00
ae05ee61d8 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-08 18:27:41 +08:00
e9b5bca0da debug chenbo 2023-09-08 18:27:27 +08:00
ac315e9704 Merge pull request '修改小组服务公司申请用车重复和取消签约回调问题' (#33) from zhangwei into dev weiz 2023-09-08 17:43:38 +08:00
2af945ac0e 修改小组服务公司申请用车重复和取消签约回调问题 unknown 2023-09-08 17:43:08 +08:00
dd74b7149c Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm mkm 2023-09-08 17:42:33 +08:00
05cda2b2d6 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-08 17:32:05 +08:00
d63346e038 update chenbo 2023-09-08 17:31:54 +08:00
fc5b54f058 Merge pull request '修改小组服务公司首页数据' (#32) from zhangwei into dev weiz 2023-09-08 17:21:03 +08:00
a479ddbcea 修改小组服务公司首页数据 unknown 2023-09-08 17:20:36 +08:00
1c668bfab1 Merge pull request '修改驳回申请逻辑' (#31) from zhangwei into dev weiz 2023-09-08 17:15:11 +08:00
5145f1eb0f 修改驳回申请逻辑 unknown 2023-09-08 17:14:45 +08:00
9694f6c91b Merge pull request '修改驳回申请逻辑' (#30) from zhangwei into dev weiz 2023-09-08 17:14:08 +08:00
60d28963cb 修改驳回申请逻辑 unknown 2023-09-08 17:13:33 +08:00
7ce89ea50d Merge pull request '修改解除合同逻辑' (#29) from zhangwei into dev weiz 2023-09-08 16:58:32 +08:00
5ac96927d2 修改解除合同逻辑 unknown 2023-09-08 16:58:09 +08:00
c0e9975a19 Merge pull request '修改解除合同逻辑' (#28) from zhangwei into dev weiz 2023-09-08 16:52:15 +08:00
d2b286e352 update chenbo 2023-09-08 16:50:39 +08:00
0e44a4d916 修改解除合同逻辑 unknown 2023-09-08 16:47:30 +08:00
76dc81f9b7 添加和编辑公司时，社会代码不可重复 chenbo 2023-09-08 16:38:07 +08:00
d61e614db9 更新前端代码 chenbo 2023-09-08 16:22:30 +08:00
555e800ee9 更新前端代码 chenbo 2023-09-08 16:11:47 +08:00
cdadfa42e9 add chenbo 2023-09-08 15:56:17 +08:00
e33e846538 add chenbo 2023-09-08 15:55:07 +08:00
80145a6a48 add chenbo 2023-09-08 15:43:56 +08:00
21a8670a45 add chenbo 2023-09-08 15:33:27 +08:00
aa72082717 add chenbo 2023-09-08 15:22:57 +08:00
8d07886168 add chenbo 2023-09-08 15:19:52 +08:00
fc6ad80351 add chenbo 2023-09-08 15:14:27 +08:00
ab1a09cae0 add:bugfix chenbo 2023-09-08 15:11:58 +08:00
d584015cf0 add:人脸采集接口，人脸采集回调，company表新增人脸采集状态字段。 chenbo 2023-09-08 15:08:25 +08:00
20bcd3c05f add:人脸采集接口，人脸采集回调，company表新增人脸采集状态字段。 chenbo 2023-09-08 15:04:39 +08:00