Commit Graph

1083 Commits

Author SHA1 Message Date
wangcheng ed05cfca3a build文件 2023-04-12 14:13:54 +08:00
Xu Chang b6e4a25f14 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-12 13:41:57 +08:00
Xu Chang 16df186172 extrafile中的属性required设置 2023-04-12 13:41:42 +08:00
wenjiarui 97e03ecfb8 userRlation&subscriptionlist修改entityDict 2023-04-11 20:32:02 +08:00
wenjiarui 2f12abdef2 二维码异步修改 2023-04-11 17:41:14 +08:00
Xu Chang 64dca4a470 extrafile的定义 2023-04-11 15:43:13 +08:00
Wang Kejun 287c96fd52 extrafile properties 2023-04-11 15:13:04 +08:00
wenjiarui e67e77c718 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-10 18:16:33 +08:00
wenjiarui 58fedd15d5 fix 2023-04-10 18:16:29 +08:00
wangcheng dcd4f36c69 lib文件 2023-04-10 17:52:30 +08:00
Xu Chang 425f5d0af3 build中的一些小问题 2023-04-10 17:41:55 +08:00
梁朝伟 c8f73a8729 fix 2023-04-10 17:23:36 +08:00
梁朝伟 d90db33b25 fix 2023-04-10 16:37:21 +08:00
Xu Chang faef8d31a0 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-10 12:02:20 +08:00
Xu Chang f232ac1407 BackendContext里加了setTemporaryId访求 2023-04-10 12:01:17 +08:00
wangwenchen 2afff791d8 properties 2023-04-10 11:41:16 +08:00
梁朝伟 43c9a82f45 fix properties 2023-04-10 09:21:40 +08:00
Xu Chang 3dda0abe2f Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-05 14:22:28 +08:00
Xu Chang 43bdaeb51b build的一些修正 2023-04-05 14:22:20 +08:00
Wang Kejun fa30041f86 extraFile disabled申明 2023-04-04 12:40:16 +08:00
wenjiarui f8e67846ca Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-03 10:39:24 +08:00
wenjiarui 25e797bb10 二维码注入当不需要取buffer时不去调用外部接口 2023-04-03 10:39:18 +08:00
Wang Kejun b0aa05c33b 扫码 projection去掉buffer 2023-04-01 00:19:41 +08:00
wenjiarui 8340ba774c logout循环注掉 2023-03-31 22:40:03 +08:00
wenjiarui 169c8f0735 token死循环先注掉 2023-03-31 22:35:47 +08:00
Xu Chang 7ac2e0fa5a 2.5.8 2023-03-31 21:36:51 +08:00
Xu Chang c1255ea349 2.5.7-publish 2023-03-31 21:35:40 +08:00
Xu Chang 887c33a610 增加了logout 2023-03-31 21:27:31 +08:00
wenjiarui 4a2ec48e7e 二维码创建逻辑改为trigger 2023-03-31 20:23:31 +08:00
Wang Kejun 59ef9173c8 时间选择 mode去掉 2023-03-31 16:53:49 +08:00
Xu Chang b329f38eff 分离了selectionRewriter,前台也注入这个逻辑 2023-03-31 16:09:00 +08:00
Xu Chang 70825388c5 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-31 14:45:38 +08:00
Xu Chang 6f5817855f userLogin的业务逻辑重构 2023-03-31 14:45:25 +08:00
wenjiarui c76862bdc9 小程序二维码注入 2023-03-31 14:04:28 +08:00
Xu Chang c6cf1847c6 BackendContext实现了refineOpRecord 2023-03-30 19:53:54 +08:00
Xu Chang d31c3995b6 新的oper对象的编译,mergeUser时处理了已经merge指向本user的行 2023-03-30 19:33:52 +08:00
Wang Kejun fe6a6453ab 登录页 已登录返回 2023-03-29 15:24:50 +08:00
Xu Chang c4c50fc1b8 2.5.7-dev 2023-03-23 14:18:58 +08:00
Xu Chang 487afad5b1 2.5.6-publish 2023-03-23 14:18:02 +08:00
Wang Kejun 4be36bce71 subscription entityid entity声明 2023-03-23 10:42:53 +08:00
Xu Chang 6355b6c55d userRelation适配frontend的改动 2023-03-22 20:26:17 +08:00
Xu Chang 4996868d44 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-22 17:33:52 +08:00
Xu Chang 04b5f41c61 token在get时,接受context作为输入。userRelation的一个oakId没置 2023-03-22 17:33:47 +08:00
Wang Kejun 1d13a448a5 locales zh_CN.json文件 2023-03-22 15:09:53 +08:00
wangwenchen ae132eddef Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev
# Conflicts:
#	src/locales/Common/locales/zh_CN.json
2023-03-22 15:01:17 +08:00
wangwenchen 061834b67b 2023-03-22 14:58:59 +08:00
wangwenchen eca3177c7d lib 2023-03-22 14:43:31 +08:00
Xu Chang 566cc9c805 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-22 14:34:39 +08:00
Xu Chang 16ee3f75d3 build 2023-03-22 14:34:35 +08:00
wenjiarui 0585f09184 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-22 12:00:55 +08:00