Commit Graph

Select branches

Hide Pull Requests

develop

feat/2024

feat/xph

feature

fix-release-1.0.0/yjc-migrate

hotfix/yjc_jd_print

master

sunny-dev

yyw

#1

#1

#10

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#12

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#14

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#159

#16

#16

#160

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#189

#19

#19

#190

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#198

#198

#199

#199

#2

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#218

#219

#219

#22

#22

#220

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#239

#239

#24

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#29

#29

#3

#3

#30

#30

#31

#31

#32

#32

#33

#33

#34

#34

#35

#35

#36

#36

#37

#37

#38

#38

#39

#39

#4

#4

#40

#40

#41

#41

#42

#42

#43

#43

#44

#44

#45

#45

#46

#46

#47

#47

#48

#48

#49

#49

#5

#5

#50

#50

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#75

#75

#76

#76

#77

#77

#78

#78

#79

#79

#8

#8

#80

#80

#81

#81

#82

#82

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#98

#99

#99

Mono Color

• cf3f571c03
  !52 sss Merge pull request !52 from develop 赵世界 2022-08-22 11:04:03 +00:00
• 94a4862240 Merge branch 'develop' of gitee.com:hzchunfen/erp into develop 赵世界 2022-08-22 19:03:15 +08:00
• 53c895ec4b feat: #10000 日志用户优化 赵世界 2022-08-22 19:03:04 +08:00
• 7a874cf137
  !51 10000 Merge pull request !51 from develop 赵世界 2022-08-22 09:51:40 +00:00
• 466bf076e0
  !49 8.22修改首页编辑图片bug及优化默认下架 Merge pull request !49 from yezhenman 赵世界 2022-08-22 09:51:11 +00:00
• d1dc9adf0d feat: #10000 用户取消邮箱验证 赵世界 2022-08-22 17:47:17 +08:00
• 24752d4365
  !50 非下架商品才可同步库存 Merge pull request !50 from develop 赵世界 2022-08-22 09:25:02 +00:00
• ab580a1c91 feat: #100000 只有非下架商品库存才可同步 赵世界 2022-08-22 17:23:52 +08:00
• 9755d297a1 8.22修改首页编辑bug yezhenman 2022-08-22 17:17:30 +08:00
• f3a893ad6c
  !48 导入数据去掉首尾空格 Merge pull request !48 from develop 赵世界 2022-08-22 08:13:07 +00:00
• c04bb104a0 fix: #10000 导入数据格式化 赵世界 2022-08-22 16:10:50 +08:00
• f475fe5de2
  !47 分页 Merge pull request !47 from develop 赵世界 2022-08-22 08:04:38 +00:00
• 89717763ca
  !46 8.20晚上首页分页优化筛选优化 Merge pull request !46 from yezhenman 赵世界 2022-08-20 10:08:48 +00:00
• ccf0a52226 8.20 last yezhenman 2022-08-20 18:07:01 +08:00
• 275ed78ec7
  !45 8.20下午修复分页筛选 Merge pull request !45 from yezhenman 赵世界 2022-08-20 10:03:52 +00:00
• 4e43c37511 feat: #100000 库存编辑同步 赵世界 2022-08-20 18:02:23 +08:00
• 3d828ebad8 8.20下午首页分页优化及其他 yezhenman 2022-08-20 17:51:59 +08:00
• fcbf67f2a3 feat: #10000 日志记录优化 赵世界 2022-08-20 17:44:14 +08:00
• 90923a1178
  !44 快团团未返回数据,代码优化 Merge pull request !44 from develop 赵世界 2022-08-20 08:34:43 +00:00
• f95516e182 feat: 赵世界 2022-08-20 16:33:57 +08:00
• 25319e2465
  !43 库存修改 Merge pull request !43 from develop 赵世界 2022-08-20 07:46:44 +00:00
• 72ffbbc40d feat: #10000 库存更新修改 赵世界 2022-08-20 15:45:40 +08:00
• c09c36e19a
  !42 多个团购库存同步 Merge pull request !42 from develop 赵世界 2022-08-20 07:29:16 +00:00
• 80e63ec32d feat: #10000 多个团购库存同步 赵世界 2022-08-20 15:28:15 +08:00
• 431be15714
  !41 code Merge pull request !41 from develop 赵世界 2022-08-20 06:56:20 +00:00
• 1aa9af74ab Merge branch 'develop' of gitee.com:hzchunfen/erp into develop 赵世界 2022-08-20 14:55:33 +08:00
• cde2baf7ce feat: #100000 更新库存编码修改 赵世界 2022-08-20 14:55:11 +08:00
• a6b15a24e3
  !40 优化 Merge pull request !40 from develop 赵世界 2022-08-20 05:44:03 +00:00
• 3014c8cfa7
  !39 8.20修复分页以及按钮，新增首页规格字段 Merge pull request !39 from yezhenman 赵世界 2022-08-20 05:43:14 +00:00
• f826eb12ed feat: #10000 优化 赵世界 2022-08-20 13:42:22 +08:00
• cd6643cf90 8.20新增首页规格字段 yezhenman 2022-08-20 10:57:38 +08:00
• 2f44dd08ee 8.20修复分页以及按钮 yezhenman 2022-08-20 10:17:22 +08:00
• 2ea53b248d
  !37 修改 Merge pull request !37 from develop 赵世界 2022-08-19 14:52:42 +00:00
• 03f8f23c83 fix: #10000 分页修改,商品导入修改 赵世界 2022-08-19 22:52:04 +08:00
• 3aa343aa21
  !36 8.19 优化侧边栏 首页筛选 分页功能 Merge pull request !36 from yezhenman 赵世界 2022-08-19 14:32:42 +00:00
• ca162234a3 8.19 last yezhenman 2022-08-19 19:28:37 +08:00
• 80158db7e5
  !35 develop Merge pull request !35 from develop 赵世界 2022-08-19 09:27:22 +00:00
• c619ee3989
  !34 8.19优化侧边栏 Merge pull request !34 from yezhenman 赵世界 2022-08-19 09:26:44 +00:00
• afb114cd4e 8.19优化侧边栏 yezhenman 2022-08-19 17:19:00 +08:00
• 2f4b148d4c
  !33 代码优化 Merge pull request !33 from develop 赵世界 2022-08-19 02:55:53 +00:00
• 5a2ef8745f feat: #20220819 代码优化 赵世界 2022-08-19 10:54:13 +08:00
• 3e3fb75beb
  !32 develope Merge pull request !32 from develop 赵世界 2022-08-18 12:03:06 +00:00
• 622467c64c
  !31 8.18晚上合并 Merge pull request !31 from yezhenman 赵世界 2022-08-18 12:01:37 +00:00
• 04a4abe7c7 Merge branch 'develop' into yezhenman yezhenman 2022-08-18 19:22:45 +08:00
• e88f3b1442 8.18 to 2 yezhenman 2022-08-18 19:21:45 +08:00
• 15d5126b7b 8.18bug yezhenman 2022-08-18 18:04:59 +08:00
• 3cb73453fb
  !29 店铺订单修改 Merge pull request !29 from develop 赵世界 2022-08-18 08:02:00 +00:00
• 31590426e8 feat: #10000 店铺订单修改 赵世界 2022-08-18 14:57:38 +08:00
• d5ba45bad2
  !28 订单获取日志记录修改 Merge pull request !28 from develop 赵世界 2022-08-18 06:32:25 +00:00
• 2e37befdda
  !27 妙选商城库存同步推送修改 Merge pull request !27 from develop 赵世界 2022-08-18 05:58:40 +00:00
• b774245cf6 feat: #20220818 订单获取日志记录修改 赵世界 2022-08-18 13:20:55 +08:00
• 73e28e6caf feat: #20220818 妙选商城库存同步修改 赵世界 2022-08-18 12:44:03 +08:00
• ed1310b1e2
  !26 代码优化 Merge pull request !26 from develop 赵世界 2022-08-18 03:23:15 +00:00
• c67ea8380e feat: #10000 代码优化 赵世界 2022-08-18 11:22:27 +08:00
• b9ef5270d5
  !25 库存同步修改 Merge pull request !25 from develop 赵世界 2022-08-18 03:09:35 +00:00
• 2de3c6b8bf feat: #10000 库存同步修改,索引优化 赵世界 2022-08-18 11:08:13 +08:00
• f9462533f4
  !24 发 Merge pull request !24 from develop 赵世界 2022-08-17 12:53:19 +00:00
• ed5fd2f5f2 feat: #10000 错误修改 赵世界 2022-08-17 20:52:44 +08:00
• 53f04a2c7f
  !23 数据传递使用数组 Merge pull request !23 from develop 赵世界 2022-08-17 12:51:01 +00:00
• 068122f3f0 feat: #10000 数据传递使用数组 赵世界 2022-08-17 20:50:03 +08:00
• 564af7f9b7
  !22 develop Merge pull request !22 from develop 赵世界 2022-08-17 11:20:34 +00:00
• 971517e578
  !21 8.17晚上合并 Merge pull request !21 from yezhenman 赵世界 2022-08-17 11:19:33 +00:00
• cb717f0991 8.17晚上 yezhenman 2022-08-17 19:16:28 +08:00
• 32d6a25bfd
  !20 1 Merge pull request !20 from develop 赵世界 2022-08-17 10:43:39 +00:00
• 9356d9b68d feat: #10000 日志记录字段更新 赵世界 2022-08-17 18:42:40 +08:00
• 15275b399c feat: #100000 预留量修改 赵世界 2022-08-17 18:34:27 +08:00
• 3d32adf1d7
  !19 库存修改 Merge pull request !19 from develop 赵世界 2022-08-17 09:18:46 +00:00
• 1d7c694fbd feat: #10000 库存修改 赵世界 2022-08-17 17:17:14 +08:00
• bc4d771ced
  !18 master Merge pull request !18 from develop 赵世界 2022-08-17 08:29:07 +00:00
• 595475d294
  !17 8.17下午实验合并第二次 Merge pull request !17 from yezhenman 赵世界 2022-08-17 08:27:49 +00:00
• 0fd6d14856 8.17 to 4 yezhenman 2022-08-17 16:26:10 +08:00
• 27495008a5 Merge branch 'yezhenman' of gitee.com:hzchunfen/erp into yezhenman yezhenman 2022-08-17 16:23:12 +08:00
• a84b853fd5 8.17 to 3 yezhenman 2022-08-17 16:22:36 +08:00
• c18f939810 feat: #10000 图片路径修改 赵世界 2022-08-17 16:21:07 +08:00
• 028b33d81c
  !16 10000 Merge pull request !16 from 赵世界/develop 赵世界 2022-08-17 08:09:12 +00:00
• ea355d3395 fix: #10000 校验规则修改 赵世界 2022-08-17 16:01:46 +08:00
• 54f6fb5a53
  !15 develop Merge pull request !15 from 赵世界/develop 赵世界 2022-08-17 07:52:16 +00:00
• 04f2a54b1e feat: #10000 删除多余目录 赵世界 2022-08-17 15:42:17 +08:00
• 0dca6fe592
  !14 8.17下午实验合并 Merge pull request !14 from yezhenman/yezhenman 赵世界 2022-08-17 07:49:03 +00:00
• 3734fdea34 Merge branch 'develop' of gitee.com:hzchunfen/erp into yezhenman yezhenman 2022-08-17 07:45:34 +00:00
• 6a0f198cad 8.17下午提交 yezhenman 2022-08-17 15:41:48 +08:00
• bfecf71d08 8.17下午 yezhenman 2022-08-17 15:40:04 +08:00
• 2d61692fec
  !13 master Merge pull request !13 from 赵世界/master 赵世界 2022-08-17 07:39:49 +00:00
• a07a67ea4a
  !12 商品转入 Merge pull request !12 from 赵世界/feature 赵世界 2022-08-17 06:49:06 +00:00
• b0f267c52a feat: #10000 增加商品下载 转录到本地商品 赵世界 2022-08-17 14:47:58 +08:00
• 61a36fb06b
  !11 修改 Merge pull request !11 from 赵世界/feature 赵世界 2022-08-17 05:55:26 +00:00
• 1f3e502f1b fix: #10000 库存同步修改 赵世界 2022-08-17 13:49:36 +08:00
• fa70c743f8
  !10 商品下载修改 Merge pull request !10 from 赵世界/feature 赵世界 2022-08-17 05:41:53 +00:00
• bdd41d4f28 feat: #10000 商品下载修改 赵世界 2022-08-17 13:40:51 +08:00
• 1a44027349
  !9 权限优化 Merge pull request !9 from feature 赵世界 2022-08-17 03:23:16 +00:00
• 403c9f96b7 feat: #20220816 权限优化 赵世界 2022-08-17 11:20:52 +08:00
• a8cb514905
  !8 商品下载 Merge pull request !8 from feature 赵世界 2022-08-17 02:26:45 +00:00
• 96630e87bc
  !7 测试修改 Merge pull request !7 from feature 赵世界 2022-08-16 14:03:08 +00:00
• 1c89064f65 feat: #10000 权限seed优化 赵世界 2022-08-16 21:26:15 +08:00
• d8510155bb feat: #10000 增加商品下载接口 赵世界 2022-08-16 21:15:15 +08:00
• 5e70ad8473 feat: #10000 测试修改 赵世界 2022-08-16 21:02:31 +08:00
• 79cfae3a26 2022.8.16 yezhenman 2022-08-16 19:57:31 +08:00
• 6ad85f359d feat: #20220815 商品图片返回,增加文件上传权限 赵世界 2022-08-16 18:24:56 +08:00
• a283a73f21
  !6 上线 Merge pull request !6 from 赵世界/feature 赵世界 2022-08-15 15:17:05 +00:00
• 10685ca9d7 feat: #000000 第一次前端打包 赵世界 2022-08-15 23:15:37 +08:00