yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206 Commits 16 Branches 0 Tags 464 MiB
6d5308528b
Commit Graph

128 Commits

Author SHA1 Message Date
翟林帆
6d5308528b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/DataMigrationController.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/Test.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readtable/ReadTable.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readtable/WordTableAttrFile.java
 2022-07-07 15:15:51 +08:00
zhal
798b56d6bf 优化质量校验代码 2022-07-06 23:26:18 +08:00
shangguochao
cb34360976 打包部署测试环境 2022-07-06 21:54:51 +08:00
zhal
ca23230e06 评论回复代码 2022-07-06 21:40:53 +08:00
anhc
74ff2c8222 method缓存获取小组用户权限数据方法修改 2022-07-06 20:37:43 +08:00
mrs_12345@163.com
60e400e8cc 快捷调整间距(暂停) 2022-07-06 20:35:13 +08:00
mrs_12345@163.com
c41fb2a31b 设计器文件属性时间选择器位置bug修复 2022-07-06 20:15:45 +08:00
shangguochao
ee65540361 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 
# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
 2022-07-06 20:03:51 +08:00
shangguochao
8e73127472 测试环境打包 2022-07-06 20:00:16 +08:00
anhc
20f07ce697 method缓存获取小区用户权限数据方法调整 2022-07-06 17:44:45 +08:00
446052889@qq.com
1e5300663a 必填校验逻辑改为后端处理 2022-07-06 17:26:58 +08:00
anhc
c90a483aed 修改小组新增文件接口默认赋值权限 2022-07-06 17:22:31 +08:00
qinoy
ba084184b5 伊利项目-设计器页面版本差异查看 2022-07-06 16:23:21 +08:00
翟林帆
b24da3a557 Merge remote-tracking branch 'origin/master' 2022-07-06 10:17:52 +08:00
翟林帆
df6107eb37 Merge branch 'datamigration-word' of https://e.coding.net/yilidev/yilipalkaifa/apps 
 Conflicts:
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/DataMigrationController.java
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlUtils.java
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/Test.java
	com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/action.xml
 2022-07-06 10:16:22 +08:00
anhc
524cd4a96c 新增文件接口中调整权限赋予位置，用户权限缓存补充对隐藏角色权限 2022-07-06 10:01:21 +08:00
chengli
d101790c41 富文本编辑第一版代码。 2022-07-05 23:36:19 +08:00
zhal
ea50f67f11 定时同步组织代码 2022-07-05 22:52:53 +08:00
zhal
ca1d50da37 定时同步组织代码 2022-07-05 22:51:14 +08:00
anhc
db8b5e6f30 打开设计页面接口内容权限控制调整 2022-07-05 21:25:26 +08:00
shangguochao
a620b40a07 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 
# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
 2022-07-05 21:20:49 +08:00
shangguochao
b51e0692b1 打包同步测试环境 2022-07-05 21:18:20 +08:00
zhal
8dfde64abc 定时同步组织代码 2022-07-05 21:12:55 +08:00
zhal
227e2b778e Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 20:53:00 +08:00
anhc
6787b98716 针对文件详情接口添加文件控制权限flag 2022-07-05 20:52:37 +08:00
anhc
a8b8bd3ba3 根据pid获取下属子文件接口权限相关内容调整 2022-07-05 20:06:07 +08:00
zhal
fb3a52a499 定时同步组织代码 2022-07-05 18:00:56 +08:00
zhal
7c64ee6083 绩效校验 2022-07-05 17:48:47 +08:00
qinoy
d8e065f57e 补提jar包 2022-07-05 17:38:00 +08:00
qinoy
4eb8786fc9 PAL主界面资产文件列表展示版本与状态信息 2022-07-05 17:30:39 +08:00
qinoy
5c90eb3de2 PAL主界面资产文件列表展示版本与状态信息 2022-07-05 17:21:50 +08:00
anhc
095fb8ce5c 修改获取获取小组权限方法，改为使用用户权限缓存 2022-07-05 17:12:08 +08:00
anhc
af0d3a1a25 获取header权限方法更换使用用户权限缓存获取app应用权限 2022-07-05 16:54:24 +08:00
anhc
f7b73da52b 补充被merge掉的代码 2022-07-05 15:42:03 +08:00
shangguochao
c0d983516c Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 15:06:17 +08:00
shangguochao
48317b9078 IT系统图新增别名属性 2022-07-05 15:06:10 +08:00
zhal
87d534ce79 注释代码 2022-07-05 14:59:17 +08:00
shangguochao
0693b72ca6 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 14:57:29 +08:00
zhal
b811007511 补全获取路径代码 2022-07-05 14:56:40 +08:00
zhal
6fd8444cf3 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 14:51:53 +08:00
zhal
0ead494ffe 定时同步组织代码 2022-07-05 14:43:47 +08:00
shangguochao
90e139546f Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 
# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
 2022-07-05 14:36:14 +08:00
mrs_12345@163.com
d7c9511bce PAL设计器时间类型输入框id修改 2022-07-05 14:09:22 +08:00
zhal
2ba17f768b 解决创建默认错误数据问题 2022-07-05 13:56:32 +08:00
anhc
bc60e9abcf 小组成员dao添加用户多角色查询方法 2022-07-05 11:28:33 +08:00
anhc
b364c72041 小组api中添加查询指定roleid的角色信息 2022-07-05 11:12:00 +08:00
shangguochao
e22cee6ac4 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 10:57:50 +08:00
shangguochao
50690d3dae 本地打包升级测试环境 2022-07-05 10:57:45 +08:00
mrs_12345@163.com
51d735e371 快捷调整间距鼠标右键菜单显示 2022-07-05 10:33:11 +08:00
zhal
c9830acae5 手动刷新数据代码 2022-07-05 10:23:27 +08:00