Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev

* 'dev' of http://192.168.124.50/wangliwen/share-platform: 500 字典类型内也返回对应字典值 bug fix 消息通知接口优化 ... 能力统计增加企业部门信息能力申请被拒绝时删除申请记录 del_flg 置1 1.门户首页基础设施统计会客厅数量错误修复 npe npe ... pageWithAttrs 非中文数量不正确的处理我的待办列表增加会议室屮
通知格式添加能力需求
2022-10-29 14:26:52 +08:00 · 2022-10-29 14:26:47 +08:00 · 2022-10-26 19:43:05 +08:00 · 2022-10-26 09:18:17 +08:00 · 2022-10-25 09:14:05 +08:00 · 2022-10-24 15:00:54 +08:00
2 changed files with 7 additions and 2 deletions
--- a/renren-admin/src/main/java/io/renren/modules/notice/until/NoticeUntil.java
+++ b/renren-admin/src/main/java/io/renren/modules/notice/until/NoticeUntil.java
@ -65,7 +65,7 @@ public class NoticeUntil {
                "  \"申请前台\": \"能力申请\"," +
                "  \"上架前台\": \"能力上架\"," +
                "  \"下架前台\": \"能力下架\"," +
-                "  \"需求前台\": \"需求评论\"," +
+                "  \"需求前台\": \"能力需求\"," +
                "  \"评论前台\": \"需求评论\"," +
                "  \"会议室前台\": \"会议室前台\"" +
                "}";
--- a/renren-admin/src/main/resources/application-prod.yml
+++ b/renren-admin/src/main/resources/application-prod.yml
@ -69,3 +69,8 @@ synchro:
 front:
  portal-url: http://15.72.183.90:7008
  manage-url: http://15.72.183.90:8001
+
+zsk:
+  url:
+    sign: https://cms.qingdao.gov.cn:31479/api-gateway/jpaas-jags-server/interface/createsign.do
+    gateway: https://cms.qingdao.gov.cn:31479/api-gateway/jpaas-jags-server/interface/gateway
Author	SHA1	Message	Date
huangweixiong	cb353085b5	Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev * 'dev' of http://192.168.124.50/wangliwen/share-platform: 500 字典类型内也返回对应字典值 bug fix 消息通知接口优化 ... 能力统计增加企业部门信息能力申请被拒绝时删除申请记录 del_flg 置1 1.门户首页基础设施统计会客厅数量错误修复 npe npe ... pageWithAttrs 非中文数量不正确的处理我的待办列表增加会议室屮	2022-10-29 14:26:52 +08:00
huangweixiong	4be4d1e19c	通知格式添加能力需求	2022-10-29 14:26:47 +08:00
huangweixiong	4042a71e4d	Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev * 'dev' of http://192.168.124.50/wangliwen/share-platform: 能力下架 npe 统计报表去掉已下架、审批时间单位、增加恩科用户 1.能力广场列表查询增加图片 2.门户首页-能力汇聚-基础设施增加会客厅和视频会议数量查询审核人为默认时允许转办知识库数目不一致的问题处理全局搜索数量支持非中文 pageWithAttrs 支持非中文试用 like 查询模式	2022-10-26 19:43:05 +08:00
huangweixiong	444284c473	Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev * 'dev' of http://221.0.232.152:9393/ability-center/share-platform: 1.能力广场应用广场bug修复，返回结果增加查询结果总数 2.算法广场和gis广场查询接口重写，增加按区市筛选条件，赶回结果增加查询结果总数查询区域管理员管理的部门接口导出时间格式调整应用广场按应用领域搜索不正确的处理调整左侧树缓存时间能力统计增加区域参数 enke:查询用户列表	2022-10-26 09:18:17 +08:00
huangweixiong	cdb7cb3012	Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev * 'dev' of http://221.0.232.152:9393/ability-center/share-platform: 打包处理 pom文件调整	2022-10-25 09:14:05 +08:00
huangweixiong	7040ce1b81	Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev * 'dev' of http://221.0.232.152:9393/ability-center/share-platform: ...	2022-10-24 15:00:54 +08:00
huangweixiong	e8b3394d7e	Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev * 'dev' of http://221.0.232.152:9393/ability-center/share-platform: enke视频会议	2022-10-24 14:26:54 +08:00
huangweixiong	f358cdf596	更新知识库配置文件	2022-10-24 14:09:39 +08:00