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

dc130190d3 update chenbo 2023-10-08 10:03:45 +08:00
fd4a3be3ee 消息列表中增加用户信息 unknown 2023-10-08 09:14:39 +08:00
7a109d30f4 Merge pull request 'dev' (#56) from dev into preview chenbo 2023-10-07 17:51:42 +08:00
4ef6554994 fixed chenbo 2023-10-07 17:49:21 +08:00
a15fef8584 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-07 17:35:38 +08:00
9c3bd3c890 add 任务下发和任务结算线上事故紧急修复接口 chenbo 2023-10-07 17:30:32 +08:00
583e998416 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into preview mkm 2023-10-07 17:14:04 +08:00
166b1600f0 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm mkm mkm 2023-10-07 17:12:57 +08:00
ab366cd69c 更新 mkm 2023-10-07 17:12:43 +08:00
432b64fd72 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-10-07 17:05:12 +08:00
b2257a85cb fixed 任务结算是结算当天的任务 chenbo 2023-10-07 17:04:58 +08:00
df34910a5c Merge pull request '修复消息列表查询结果' (#55) from zhangwei into dev weiz 2023-10-07 16:06:06 +08:00
ece05b9859 修复消息列表查询结果 unknown 2023-10-07 16:04:47 +08:00
7b0af59720 Merge pull request 'update' (#54) from zhangwei into dev weiz 2023-10-07 11:30:57 +08:00
fb79526c42 update unknown 2023-10-07 11:30:10 +08:00
cb976433ce Merge pull request 'patch' (#53) from zhangwei into dev weiz 2023-10-07 11:28:42 +08:00
60c7a6f32b patch unknown 2023-10-07 10:53:08 +08:00
5b475d66d0 Merge pull request 'add getAreaManager method' (#52) from zhangwei into dev weiz 2023-10-07 09:48:14 +08:00
5f6318bfa9 add getAreaManager method unknown 2023-10-07 09:46:30 +08:00
1148560514 Merge pull request 'dev' (#51) from dev into preview mkm 2023-10-04 11:20:23 +08:00
97fb87d461 Merge pull request 'contact list sort' (#50) from zhangwei into dev weiz 2023-09-28 17:42:46 +08:00
1910b40c8d contact list sort unknown 2023-09-28 17:42:06 +08:00
d19e99d980 Merge pull request 'add im api' (#49) from zhangwei into dev weiz 2023-09-28 17:17:44 +08:00
057d9091f2 add im api unknown 2023-09-28 17:16:22 +08:00
caa048d50d Merge pull request 'updata im api' (#48) from zhangwei into dev weiz 2023-09-28 10:31:31 +08:00
5eb383da6a updata im api unknown 2023-09-28 10:30:14 +08:00
d46c1332ff Merge pull request 'im' (#47) from zhangwei into dev weiz 2023-09-28 09:10:01 +08:00
be532b87da im unknown 2023-09-27 17:54:21 +08:00
37f9d18652 Merge branch 'mkm' of https://gitea.lihaink.cn/mkm/TaskSystem into dev mkm 2023-09-27 16:13:03 +08:00
8208a1974e 更新 mkm 2023-09-27 16:12:20 +08:00
3a92b26515 Merge pull request 'dev' (#46) from dev into preview chenbo 2023-09-27 15:49:34 +08:00
65c2a46e34 fixed chenbo 2023-09-27 14:44:08 +08:00
f3f63c38c2 fixed chenbo 2023-09-27 14:43:42 +08:00
29e88fb534 Merge pull request 'dev' (#45) from dev into preview chenbo 2023-09-27 10:58:31 +08:00
0779b5c590 debug chenbo 2023-09-27 10:12:04 +08:00
ebd1b1108e debug chenbo 2023-09-27 09:40:31 +08:00
34d9ba72ae 小程序版本 chenbo 2023-09-26 15:57:08 +08:00
e20f6d9ce5 小程序版本 chenbo 2023-09-26 15:52:51 +08:00
5b0fb32c67 督促完成需求收集和交易任务的金额计算特殊处理 chenbo 2023-09-26 14:10:19 +08:00
d98e634f38 Merge pull request 'dev' (#44) from dev into preview chenbo 2023-09-26 11:56:58 +08:00
8434a24bd6 前台创建用户手机号不可重复 chenbo 2023-09-26 11:55:59 +08:00
4bd43d4a08 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm mkm 2023-09-26 11:10:00 +08:00
0ee6a92f5f Merge pull request 'master' (#43) from master into preview mkm 2023-09-26 09:18:52 +08:00
1b92b0f40f Merge pull request 'master' (#42) from master into dev mkm 2023-09-26 09:18:33 +08:00
3034eaf5b1 更新 mkm 2023-09-25 22:04:03 +08:00
b358dfe299 修复 mkm 2023-09-25 22:00:21 +08:00
285554a8ba 更新 mkm 2023-09-25 21:58:23 +08:00
f0d4d0589e 更新 mkm 2023-09-25 21:34:14 +08:00
f83ff91c64 Merge pull request 'preview' (#41) from preview into master mkm 2023-09-25 19:26:43 +08:00
eff3d94cc3 Merge pull request 'dev' (#40) from dev into preview mkm 2023-09-25 19:26:27 +08:00
0f9d69f1d0 更新 mkm 2023-09-25 19:25:59 +08:00
4e296b792d 修改代码中关于镇农科公司的描述 chenbo 2023-09-25 19:11:50 +08:00
7369b477d7 41 镇农科公司 chenbo 2023-09-25 18:57:52 +08:00
adb53a2840 debug 发送短信 chenbo 2023-09-25 18:25:10 +08:00
e3b189b1cc Merge pull request 'preview' (#39) from preview into master mkm 2023-09-25 18:09:08 +08:00
2ef858608e Merge pull request 'dev' (#38) from dev into preview mkm 2023-09-25 18:08:43 +08:00
2cefddba52 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-25 16:46:06 +08:00
df1b8ad0fb fixed chenbo 2023-09-25 16:45:57 +08:00
c3cea3b8ec Merge pull request '更新 app/api/controller/CompanyController.php' (#37) from preview into master mkm 2023-09-25 16:11:24 +08:00
876aa66048 更新 app/api/controller/CompanyController.php mkm 2023-09-25 16:05:27 +08:00
8d439540b6 跟新 mkm 2023-09-25 16:04:45 +08:00
ad0d3a3cd8 Merge pull request '更新 app/api/controller/CompanyController.php' (#36) from preview into master mkm 2023-09-25 14:53:57 +08:00
88b79bfef6 更新 app/api/controller/CompanyController.php mkm 2023-09-25 14:46:29 +08:00
6f3f36f87b 修复管理公司查询 mkm 2023-09-25 14:44:27 +08:00
3a3e5294f2 其他任务审批列表过滤 chenbo 2023-09-25 14:10:39 +08:00
2c2296db20 投诉反馈 chenbo 2023-09-25 12:00:17 +08:00
88ebf59278 前端打包代码 chenbo 2023-09-25 11:50:08 +08:00
814bc8f60d 余额列表-公司用户列表接口 chenbo 2023-09-25 11:26:21 +08:00
9574741088 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-25 10:28:09 +08:00
3a0b20e5aa fixed chenbo 2023-09-25 10:27:56 +08:00
d1d2e38e84 Merge branch 'preview' of https://gitea.lihaink.cn/mkm/TaskSystem shengchanzhe 2023-09-25 00:35:26 +08:00
17fadf9910 Merge pull request 'dev' (#34) from dev into preview mkm 2023-09-24 19:32:52 +08:00
4dec31a0d9 更新 app/api/controller/CompanyController.php mkm 2023-09-24 19:29:02 +08:00
75bbfedc89 修复权限 mkm 2023-09-23 19:11:44 +08:00
b2d9183891 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev mkm 2023-09-23 18:59:02 +08:00
fb60fa3f9a 查询镇管理公司 mkm 2023-09-23 18:59:00 +08:00
9f17ef2957 fixed chenbo 2023-09-23 18:53:11 +08:00
ebaf3caf5d fixed chenbo 2023-09-23 18:41:54 +08:00
7b40b7d5f5 fix chenbo 2023-09-23 18:21:39 +08:00
9bacfb181b fix chenbo 2023-09-23 18:08:00 +08:00
3c09a50839 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-23 17:01:39 +08:00
dbbc2cd531 debug chenbo 2023-09-23 17:00:10 +08:00
d3df418ff7 更新定位 mkm 2023-09-23 16:31:26 +08:00
e3d778163a 镇管理官司任务详情接口，任务4提交接口 chenbo 2023-09-23 16:26:42 +08:00
e2309b5a0f 股金变动记录 chenbo 2023-09-23 16:04:42 +08:00
87c79b1ae6 镇管理公司任务类型数据字典 chenbo 2023-09-23 16:00:37 +08:00
0f112c95ca 镇管理公司任务类型数据字典 chenbo 2023-09-23 15:55:58 +08:00
06788042d5 镇管理公司任务-定时下发任务，结算接口 chenbo 2023-09-23 15:45:40 +08:00
5881c0d584 镇管理公司任务-任务6，任务7结算 chenbo 2023-09-23 15:32:26 +08:00
31e438117b 投诉反馈接口 chenbo 2023-09-23 15:23:21 +08:00
e924e9f65a 投诉反馈 chenbo 2023-09-23 15:18:33 +08:00
768e789eca Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-23 15:12:57 +08:00
92591b4b51 投诉反馈 chenbo 2023-09-23 15:12:45 +08:00
2e8a756998 Merge pull request '更新' (#33) from preview into dev mkm 2023-09-23 14:53:47 +08:00
549bffc2de 更新 mkm 2023-09-23 14:53:00 +08:00
866160869c 镇管理公司任务-小组服务公司上交股金接口 chenbo 2023-09-23 14:24:47 +08:00
2ce270d7cf Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-09-23 14:23:23 +08:00
41758438a4 镇管理公司任务-小组服务公司上交股金接口 chenbo 2023-09-23 14:23:12 +08:00
7acc6a1824 Merge pull request 'preview' (#32) from preview into dev mkm 2023-09-23 14:21:14 +08:00
dabac037c4 镇管理公司任务-小组服务公司上交股金接口 chenbo 2023-09-23 14:19:51 +08:00