Commit Graph

84 Commits

Author SHA1 Message Date
cuibaocheng
b10e031520 Merge remote-tracking branch 'origin/main' into main 2021-06-01 11:10:59 +08:00
wans
ce070cdf37 修复枚举类bug 2021-05-31 17:56:14 +08:00
wans
1863a664c1 Merge branch 'main' of e.coding.net:tsteam/business-card/business-card into main 2021-05-31 17:54:00 +08:00
wans
3f4169e031 修改 2021-05-31 17:53:53 +08:00
ly19960718
5aeb6d6e75 用户栏目新增app接口 2021-05-31 17:43:47 +08:00
ly19960718
3eb14d2d4c 用户栏目新增app接口 2021-05-31 17:38:50 +08:00
ly19960718
94105e6da1 用户栏目新增app接口 2021-05-31 17:37:02 +08:00
cuibaocheng
4cc1a0e061 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	src/main/java/cn/com/tenlion/pojo/dtos/usercolumndata/UserColumnDataDTO.java
#	src/main/java/cn/com/tenlion/pojo/vos/usercolumndata/UserColumnDataVO.java
#	src/main/java/cn/com/tenlion/service/usercolumndata/impl/UserColumnDataServiceImpl.java
2021-05-31 17:36:01 +08:00
ly19960718
5b1fc9cdcb Merge remote-tracking branch 'origin/main' 2021-05-31 17:35:14 +08:00
ly19960718
8b83f8a6b9 用户栏目新增app接口 2021-05-31 17:35:02 +08:00
cuibaocheng
d5450bee3f 增加素材库模块 2021-05-31 17:34:25 +08:00
wans
71fb9e9c03 Merge branch 'main' of e.coding.net:tsteam/business-card/business-card into main 2021-05-31 17:05:53 +08:00
wans
fa720f306d 修改api说明 2021-05-31 17:05:45 +08:00
Renpc-kilig
d49aa361d9 我的菜单配置功能新增。
bug修改。
2021-05-31 17:05:08 +08:00
wans
6c9372c33a 添加小程序栏目管理功能 2021-05-31 16:43:46 +08:00
wans
581421f234 Merge branch 'main' of e.coding.net:tsteam/business-card/business-card into main 2021-05-31 14:53:00 +08:00
wans
aa8c150369 添加小程序栏目管理 2021-05-31 14:52:52 +08:00
ly19960718
02b8d564c0 名称增加栏目功能 2021-05-28 17:15:18 +08:00
ly19960718
a598f5a873 2021-05-21 2021-05-24 18:24:04 +08:00
dong_bo0602
88671da61e Merge remote-tracking branch 'origin/main' into main 2021-04-29 15:05:06 +08:00
dong_bo0602
92aaef5b9f 绘制名片 2021-04-29 15:04:41 +08:00
Renpc-kilig
238ef63817 默认名片功能新增。 2021-04-29 15:02:42 +08:00
Renpc-kilig
e28897818e bug修改。 2021-04-23 18:45:53 +08:00
ly19960718
0fbb22e248 名片转发记录,查看记录 2021-04-23 18:19:06 +08:00
Renpc-kilig
cccd96eb03 个人名片bug修改。
名片卡包bug修改。
个人名片功能修改。
名片卡包功能修改。
2021-04-21 14:52:34 +08:00
cuibaocheng
a74fab8d91 增加店铺动态 / 个人动态 / 增加html转图片的模板预览图 2021-04-20 17:03:37 +08:00
cuibaocheng
00bc9fb754 增加店铺动态 / 个人动态 / 增加html转图片的模板预览图 2021-04-20 16:52:35 +08:00
Renpc-kilig
b0748bcdc7 商品类目重构。
bug修改。
2021-04-20 16:33:23 +08:00
Renpc-kilig
207c896a0e 给营业执照实体类添加注解
修改bug
2021-04-14 16:19:47 +08:00
Renpc-kilig
605549e648 店铺详情新增行业相关字段信息。 2021-04-14 14:44:04 +08:00
Renpc-kilig
464b7f5c4b 商品类目功能重构。bug修改。 2021-04-14 10:38:12 +08:00
ly19960718
a1be7140e8 店铺新增添加默认字段 2021-04-09 19:00:01 +08:00
ly19960718
0cf5871afb 店铺认证、人员拓展属性、店铺功能修改 2021-04-09 18:14:42 +08:00
ly19960718
9546f17e9b 店铺新加字段 2021-04-09 09:56:22 +08:00
ly19960718
e4888b4a93 扫码功能 2021-04-08 17:11:04 +08:00
Renpc-kilig
3482f06a32 bug修改,审核全局配置功能新增。 2021-04-08 17:04:52 +08:00
ly19960718
7476a28c2f Merge remote-tracking branch 'origin/main' 2021-04-01 17:59:30 +08:00
ly19960718
99424fb80a 店铺详情页功能 2021-04-01 17:59:23 +08:00
Renpc-kilig
129cce5c75 功能新增。 2021-04-01 17:58:04 +08:00
Renpc-kilig
a0692662b8 功能新增和bug修改。 2021-04-01 17:39:14 +08:00
ly19960718
7a43d9a7d6 店铺详情页功能 2021-03-24 17:31:41 +08:00
ly19960718
e33fa4ea3a Merge remote-tracking branch 'origin/main' 2021-03-24 17:30:57 +08:00
Renpc-kilig
8ee766b0e3 Merge remote-tracking branch 'origin/main' into main 2021-03-23 15:15:15 +08:00
Renpc-kilig
227f733ff9 店铺商品 2021-03-23 15:14:35 +08:00
ly19960718
6be12249c4 店铺详情页功能 2021-03-22 17:59:34 +08:00
ly19960718
d8b6f4b3bb 店铺相关功能 2021-03-22 17:54:11 +08:00
ly19960718
cfd594072d Merge branch 'main' of D:\CF_work\ideaWorkSpace\business-card with conflicts. 2021-03-22 17:53:45 +08:00
cuibaocheng
f7f991567b 1 2021-03-20 16:53:53 +08:00
cuibaocheng
0a70bfda6f 1 2021-03-20 16:52:20 +08:00
Renpc-kilig
5a94052e7f 系统文件 2021-03-20 16:46:04 +08:00