Commit Graph

28 Commits

Author SHA1 Message Date
wwb 637ebbcb20 Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev 2024-10-14 16:55:51 +08:00
wwb b61339d5c9 下单首页提交202410114 2024-10-14 16:55:27 +08:00
YuanFeng 018f89c050 优化 修复表中图片预览层级错乱问题 2024-10-10 20:42:26 +08:00
YuanFeng 20c6ca8beb 优化 更新表格允许拖宽,非必要字段不显示 2024-10-10 19:22:56 +08:00
YuanFeng 932fbf9015 优化 稿件预览 2024-10-09 10:15:53 +08:00
YuanFeng 0828d7376b 修复 稿件预览 2024-10-09 09:40:46 +08:00
YuanFeng 7b3e0d944a 下单页面 接口对接 2024-10-08 23:41:50 +08:00
YuanFeng a12b47aeac Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2024-10-06 08:44:33 +08:00
YuanFeng f314af7ad2 调整 稿件图片存储方式,新增产品工艺 2024-10-06 08:38:50 +08:00
Mrking 7550592b8a 新增前端下单首页 2024-09-24 23:45:30 +08:00
Mrking fe4019d27d 新增前端订单列表 2024-09-23 22:46:24 +08:00
YuanFeng c20846faf3 稿件 设计同步前台项目 2024-09-17 14:05:44 +08:00
YuanFeng 785bcede9f 改造 优化产品保养项,产品支持多稿件关联,产品保养预览数据结构优化
修复 已知错误
2024-09-08 16:34:49 +08:00
YuanFeng aa9f2504f0 同步 admin端稿件管理代码 2024-09-05 21:59:51 +08:00
YuanFeng afa22d2286 Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev 2024-09-05 15:44:17 +08:00
YuanFeng 3d6c978db6 临时 提交 2024-09-05 15:43:05 +08:00
Mrking ff46f4d940 新增订单信息 2024-09-04 00:24:14 +08:00
Mrking 5e9a1449ec 删除多余模块 2024-09-03 13:10:46 +08:00
Mrking fb0a227f9c Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev 2024-09-03 13:06:22 +08:00
Mrking 96b087489f 增加生产制单 2024-09-03 13:05:57 +08:00
YuanFeng 432362174e fix 品牌接口 2024-09-02 10:30:41 +08:00
YuanFeng 4d2689377b Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev 2024-09-02 10:17:44 +08:00
YuanFeng fb4e1f3fe1 优化 主页 2024-09-02 10:15:39 +08:00
Mrking 2cfd3db67a Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
# Conflicts:
#	hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
#	hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/oauth2/OAuth2OpenConvertImpl.java
#	hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/social/SocialUserConvertImpl.java
2024-09-01 18:39:16 +08:00
YuanFeng 250a06e19d fix dialog组件文件 2024-09-01 15:51:14 +08:00
YuanFeng a2231b68de Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
# Conflicts:
#	hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
#	hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPreviewDialog.vue
#	hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue
2024-09-01 15:20:38 +08:00
Mrking 1c9bca7345 新增品牌关系表 2024-08-30 08:13:57 +08:00
Mrking 320e76dad4 销售订单 2024-08-25 18:15:14 +08:00