Commit Graph

805 Commits

Author SHA1 Message Date
yss
66713dad3c 沃文档-加日志 2023-06-06 15:00:51 +08:00
yss
f2d4bd5a02 Merge branch 'master-沃文档' into uat_code 2023-06-06 14:47:49 +08:00
yss
4a0b436b85 沃文档-获取链接、回调接口:查询文件 及保存 2023-06-06 14:45:45 +08:00
yss
8fd79cb5a2 Merge branch 'master-沃文档' into uat_code 2023-06-06 11:41:38 +08:00
yss
7278ff5255 沃文档-获取链接、回调接口:查询文件 及保存 2023-06-06 11:40:44 +08:00
yss
81abaf0d6b Merge branch 'master-沃文档' into uat_code 2023-06-06 10:45:16 +08:00
yss
b6c2031b41 沃文档-获取链接、回调接口:查询文件 及保存 2023-06-06 10:44:24 +08:00
yss
cc67ad3dcc Merge branch 'master-沃文档' into uat_code 2023-06-06 09:33:33 +08:00
yss
269cbe9892 沃文档-获取链接、回调接口:查询文件 及保存 2023-06-06 09:30:33 +08:00
yss
2b81884156 Merge branch 'master-沃文档' into uat_code 2023-06-05 14:32:00 +08:00
yss
7dc44bb1df 沃文档-获取链接、回调接口:查询文件 及保存 2023-06-05 14:31:07 +08:00
yss
1f53c11bd4 沃文档-获取链接、回调接口:查询文件 及保存 2023-06-05 14:13:23 +08:00
yss
f5d39d8229 Merge branch 'master-沃文档' into uat_code 2023-06-05 13:31:31 +08:00
yss
bbeff5a496 沃文档-获取链接、回调接口:查询文件 及保存 2023-06-05 13:29:41 +08:00
yss
223c258584 Merge branch 'master-沃文档' into uat_code 2023-06-05 11:35:57 +08:00
yss
d9c5844688 沃文档-获取链接、回调接口:查询文件 及保存 2023-06-05 11:24:08 +08:00
yss
1d0fd0548f 沃文档-获取链接、回调接口:查询文件 及保存 2023-06-05 11:15:44 +08:00
yss
b0e1e320e4 Merge branch '长春联通电子评标室' into uat_code
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/BizFuncSwitchConfigMapper.java
2023-05-22 10:27:05 +08:00
yss
b4a6836184 长春联通电子评标室 2023-05-22 10:20:39 +08:00
yss
aeeedbc0ed Merge branch 'master-高质量运营2' 2023-05-12 23:19:15 +08:00
yss
860fa0949f 高质量-修改没数据时报文档中心错误 2023-05-12 23:12:04 +08:00
yss
be140d1f3a Merge branch 'master-高质量运营2' 2023-05-12 14:11:05 +08:00
yss
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
yss
729ed7cb1e Merge branch 'master-高质量运营2' into uat_code 2023-05-08 13:44:44 +08:00
yss
345635f144 高质量-学习园区排行省分、个人 2023-05-08 13:42:55 +08:00
yss
e2a61f91da Merge branch 'master-高质量运营2' into uat_code 2023-04-27 11:33:42 +08:00
yss
cb69163682 高质量-是否点赞 2023-04-27 11:03:34 +08:00
yss
a4ca3262d5 Merge branch 'master-高质量运营2' into uat_code 2023-04-26 11:02:39 +08:00
yss
c2643b420d 高质量-点赞数、评论数 2023-04-26 10:58:22 +08:00
yss
eab622be62 Merge branch 'master-高质量运营2' into uat_code 2023-04-26 10:21:16 +08:00
yss
e780cd393c 高质量-oss上传RequestPart 2023-04-26 09:38:40 +08:00
yss
6a664d4d95 高质量-oss下载改成get请求 2023-04-25 15:37:21 +08:00
yss
8ec481c718 Merge branch 'master-高质量运营2' into uat_code 2023-04-25 09:57:17 +08:00
yss
24e42fe932 高质量-运营提升小课堂 2023-04-25 09:54:30 +08:00
yss
a897a5b364 Merge branch 'master-特殊用户控制' into uat_code 2023-04-23 15:51:36 +08:00
yss
48eb0d9cd6 监督-特殊用户控制 2023-04-23 15:49:54 +08:00
yss
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
yss
4902263bd1 高质量运营-新 2023-04-23 15:42:08 +08:00
yss
c2726678b6 Merge remote-tracking branch 'origin/master-特殊用户控制' into uat_code 2023-04-23 15:19:33 +08:00
yss
c84683221a 监督角色功能控制 2023-04-23 14:58:41 +08:00
yss
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
yss
b28d4651ee 监督角色功能控制 2023-04-23 14:21:16 +08:00
yss
2c3123d430 Merge branch 'master-高质量运营' into uat_code
# Conflicts:
#	deployment-uat.yaml
2023-04-23 09:42:18 +08:00
yss
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
yss
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
yss
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
yss
c9b51e4b49 高质量运营:oss上传、点赞、评论 2023-04-21 16:26:52 +08:00