|
|
7aea807d88
|
Merge remote-tracking branch 'origin/master-云门户待阅'
# Conflicts:
# src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/BizFuncSwitchConfigMapper.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/mapper/BizFuncSwitchConfigMapper.xml
|
2023-05-12 14:09:54 +08:00 |
|
|
|
729ed7cb1e
|
Merge branch 'master-高质量运营2' into uat_code
|
2023-05-08 13:44:44 +08:00 |
|
|
|
345635f144
|
高质量-学习园区排行省分、个人
|
2023-05-08 13:42:55 +08:00 |
|
|
|
e2a61f91da
|
Merge branch 'master-高质量运营2' into uat_code
|
2023-04-27 11:33:42 +08:00 |
|
|
|
cb69163682
|
高质量-是否点赞
|
2023-04-27 11:03:34 +08:00 |
|
|
|
a4ca3262d5
|
Merge branch 'master-高质量运营2' into uat_code
|
2023-04-26 11:02:39 +08:00 |
|
|
|
c2643b420d
|
高质量-点赞数、评论数
|
2023-04-26 10:58:22 +08:00 |
|
|
|
eab622be62
|
Merge branch 'master-高质量运营2' into uat_code
|
2023-04-26 10:21:16 +08:00 |
|
|
|
e780cd393c
|
高质量-oss上传RequestPart
|
2023-04-26 09:38:40 +08:00 |
|
|
|
6a664d4d95
|
高质量-oss下载改成get请求
|
2023-04-25 15:37:21 +08:00 |
|
|
|
8ec481c718
|
Merge branch 'master-高质量运营2' into uat_code
|
2023-04-25 09:57:17 +08:00 |
|
|
|
24e42fe932
|
高质量-运营提升小课堂
|
2023-04-25 09:54:30 +08:00 |
|
|
|
a897a5b364
|
Merge branch 'master-特殊用户控制' into uat_code
|
2023-04-23 15:51:36 +08:00 |
|
|
|
48eb0d9cd6
|
监督-特殊用户控制
|
2023-04-23 15:49:54 +08:00 |
|
|
|
c847ca413c
|
Merge branch 'master-高质量运营2' into uat_code
# Conflicts:
# src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityMaintainController.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/dao/mapper/HighQualityCommentMapper.xml
# src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/entity/HighQualityComment.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityCommentServiceImpl.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/uploadOss/service/impl/UploadOssServiceImpl.java
|
2023-04-23 15:46:00 +08:00 |
|
|
|
4902263bd1
|
高质量运营-新
|
2023-04-23 15:42:08 +08:00 |
|
|
|
c2726678b6
|
Merge remote-tracking branch 'origin/master-特殊用户控制' into uat_code
|
2023-04-23 15:19:33 +08:00 |
|
|
|
c84683221a
|
监督角色功能控制
|
2023-04-23 14:58:41 +08:00 |
|
|
|
0059882603
|
Merge branch 'master-特殊用户控制' into uat_code
# Conflicts:
# deployment-uat.yaml
# src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/BizFuncSwitchConfigMapper.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/mapper/BizFuncSwitchConfigMapper.xml
|
2023-04-23 14:28:53 +08:00 |
|
|
|
b28d4651ee
|
监督角色功能控制
|
2023-04-23 14:21:16 +08:00 |
|
|
|
2c3123d430
|
Merge branch 'master-高质量运营' into uat_code
# Conflicts:
# deployment-uat.yaml
|
2023-04-23 09:42:18 +08:00 |
|
|
|
66d091f399
|
高质量运营：oss上传
|
2023-04-23 09:29:42 +08:00 |
|
|
|
965dec6ead
|
Merge branch 'master-高质量运营' into 'uat_code'
高质量运营：oss上传
See merge request eshop/biz_service_ebtp_extend!13
|
2023-04-23 01:09:40 +00:00 |
|
|
|
fa59321cdb
|
高质量运营：oss上传
|
2023-04-23 09:07:45 +08:00 |
|
|
|
78ee8fa801
|
Merge branch 'master-高质量运营' into 'uat_code'
高质量运营：oss上传、点赞、评论
See merge request eshop/biz_service_ebtp_extend!12
|
2023-04-23 00:50:54 +00:00 |
|
|
|
53cfb7f588
|
高质量运营：oss上传、点赞、评论
|
2023-04-21 17:25:11 +08:00 |
|
|
|
a7a97c6482
|
Merge branch 'master-高质量运营' into 'uat_code'
Master 高质量运营
See merge request eshop/biz_service_ebtp_extend!11
|
2023-04-21 08:27:58 +00:00 |
|
|
|
c9b51e4b49
|
高质量运营：oss上传、点赞、评论
|
2023-04-21 16:26:52 +08:00 |
|
|
|
0f33b75c42
|
Merge branch 'master-云门户待阅' into 'uat_code'
Master 云门户待阅
See merge request eshop/biz_service_ebtp_extend!10
|
2023-04-19 06:42:54 +00:00 |
|
|
|
4549d65e2e
|
待阅功能
|
2023-04-19 14:37:49 +08:00 |
|
|
|
984cab3089
|
待阅功能
|
2023-04-18 17:20:23 +08:00 |
|
|
|
496ee76460
|
Merge branch 'master-云门户待阅' into 'uat_code'
待阅功能
See merge request eshop/biz_service_ebtp_extend!9
|
2023-04-18 05:59:50 +00:00 |
|
|
|
ab730ad2c5
|
待阅功能
|
2023-04-18 13:57:45 +08:00 |
|
|
|
c5a78b6d92
|
Merge branch 'master-云门户待阅' into 'uat_code'
待阅功能
See merge request eshop/biz_service_ebtp_extend!8
|
2023-04-18 05:46:36 +00:00 |
|
|
|
acff63646f
|
待阅功能
|
2023-04-18 13:45:41 +08:00 |
|
|
|
0a95775bc2
|
Merge branch 'master-云门户待阅' into 'uat_code'
待阅功能
See merge request eshop/biz_service_ebtp_extend!7
|
2023-04-18 03:11:29 +00:00 |
|
|
|
ed27ac8115
|
待阅功能
|
2023-04-18 11:09:20 +08:00 |
|
|
|
bd96bb0aa5
|
高质量运营
|
2023-04-14 15:53:59 +08:00 |
|
|
|
c6c0a28d71
|
Merge branch 'master-高质量运营' into 'uat_code'
高质量运营
See merge request eshop/biz_service_ebtp_extend!6
|
2023-04-14 06:26:53 +00:00 |
|
|
|
70f84f10a6
|
高质量运营
|
2023-04-14 14:15:32 +08:00 |
|
|
|
fcaae524af
|
Update deployment-uat.yaml 去掉cfs
|
2023-04-14 02:30:21 +00:00 |
|
|
|
36b1aca3ed
|
Update deployment-uat.yaml 去掉cfs
|
2023-04-14 02:28:55 +00:00 |
|
|
|
f676b30e7d
|
Merge branch 'master-短信加是否启用标识' into 'master'
Master 短信加是否启用标识
See merge request eshop/biz_service_ebtp_extend!5
|
2023-03-31 13:56:27 +00:00 |
|
|
|
c3a2d5e16e
|
Merge branch 'master-短信加是否启用标识' into 'uat_code'
短信模板加启用标识根据标识判断是否发送短信
See merge request eshop/biz_service_ebtp_extend!4
|
2023-03-08 01:42:56 +00:00 |
|
|
|
f65ab04f2d
|
短信模板加启用标识根据标识判断是否发送短信
|
2023-03-08 09:29:41 +08:00 |
|
|
|
2a9e0fdf2f
|
Merge branch 'master-短信加是否启用标识' into 'uat_code'
短信模板加启用标识根据标识判断是否发送短信
See merge request eshop/biz_service_ebtp_extend!3
|
2023-03-07 00:36:59 +00:00 |
|
|
|
a14d1dd06c
|
短信模板加启用标识根据标识判断是否发送短信
|
2023-03-07 08:31:31 +08:00 |
|
|
|
7a62620c99
|
Merge branch 'master_区块链天擎修复' into uat_code
|
2023-01-17 15:26:27 +08:00 |
|
|
|
3d5998f767
|
修复区块链天擎拼接参数 getUniBss 使用错误
|
2023-01-17 15:24:14 +08:00 |
|
|
|
5606132c84
|
修复区块链天擎拼接参数 getUniBss 使用错误
|
2023-01-17 15:02:08 +08:00 |
|
