Commit Graph

20 Commits

Author SHA1 Message Date
caishi d872ffc606 merge 2021-04-23 16:31:15 +08:00
caishi 80ef857048 box top 2020-10-30 10:13:08 +08:00
caishi 62b99c7921 Merge branch 'dev_chain' of https://git.trustie.net/jasder/forgeplus-react into dev_devOps
# Conflicts:
#	src/forge/Merge/UpdateMerge.js
#	src/forge/Order/Detail.js
#	src/forge/Order/OrderItem.js
#	src/forge/Order/order_form.js
2020-10-22 22:41:16 +08:00
caishi 36a9f16634 头部改版 2020-10-09 09:24:57 +08:00
caishi 776ebfdef5 头部 2020-09-16 17:09:31 +08:00
caishi c71feff3fc 问题反馈 2020-07-21 15:29:11 +08:00
sylor_huang@126.com e07e5d9952 change projects styles2 2020-07-07 14:28:02 +08:00
sylor_huang@126.com 7847637355 change 2020-07-07 12:00:12 +08:00
sylor_huang@126.com b38e8bd1b9 change pr 2020-06-30 10:08:36 +08:00
caishi c93aad2536 update 2020-06-18 11:36:05 +08:00
sylor_huang@126.com c9cfd7925c conflict 2020-06-12 18:00:13 +08:00
sylor_huang@126.com 5a235763db 修改合并请求 2020-06-12 17:58:58 +08:00
caishi 080b1f0e39 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-11 15:40:30 +08:00
caishi 49dd7dcde0 组织模块-部分前端页面 2020-06-11 15:40:22 +08:00
sylor_huang@126.com d6b1da7971 修改个人中心的样式问题 2020-06-10 17:19:11 +08:00
caishi 62be5c0388 new version 2020-05-20 18:11:32 +08:00
caishi 3b9e24a9f8 新版首页和头部 2020-05-11 14:18:32 +08:00
caishi b8daab01e6 进入老版本 2020-05-07 18:27:03 +08:00
caishi 5f35b8dc91 style 代码清理 2020-05-06 16:52:00 +08:00
caishi 4bfd4234b5 优化版 2020-04-28 17:23:34 +08:00