diff --git a/ghy-admin/src/main/resources/static/css/login.css b/ghy-admin/src/main/resources/static/css/login.css index 63a9b01c..b057fb11 100644 --- a/ghy-admin/src/main/resources/static/css/login.css +++ b/ghy-admin/src/main/resources/static/css/login.css @@ -16,7 +16,9 @@ body.signin { } .signinpanel .logopanel { float:none; - width:auto; + /*width:auto;*/ + width: 121px; + height: 75px; padding:0; background:0 0 } diff --git a/ghy-admin/src/main/resources/static/ruoyi.png b/ghy-admin/src/main/resources/static/ruoyi.png index b0af01fe..113bb792 100644 Binary files a/ghy-admin/src/main/resources/static/ruoyi.png and b/ghy-admin/src/main/resources/static/ruoyi.png differ diff --git a/ghy-admin/src/main/resources/templates/login.html b/ghy-admin/src/main/resources/templates/login.html index 2d002447..7be20233 100644 --- a/ghy-admin/src/main/resources/templates/login.html +++ b/ghy-admin/src/main/resources/templates/login.html @@ -3,8 +3,8 @@ - 登录工圈子系统 - + 登录叮咚工链系统 + @@ -26,16 +26,16 @@
-

[ 工圈子 ]

+

[ 叮咚工链 ]

-

欢迎使用 工圈子 后台管理系统

+

欢迎使用 叮咚工链 后台管理系统

还没有账号? 立即注册»
@@ -65,7 +65,7 @@
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java new file mode 100644 index 00000000..9a4407de --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -0,0 +1,11 @@ +package com.ghy.order.domain; + +/** + * @author clunt + * 细单表(转派后产生的订单) + */ +public class OrderDetail { + + + +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java new file mode 100644 index 00000000..4625e3cc --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -0,0 +1,15 @@ +package com.ghy.order.domain; + +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author clunt + * 主单表(对应付款订单) + */ +@Data +public class OrderMaster extends BaseEntity { + + private static final long serialVersionUID = 1L; + +} diff --git a/ghy-payment/src/main/java/com/ghy/payment/PaymentApplication.java b/ghy-payment/src/main/java/com/ghy/payment/PaymentApplication.java deleted file mode 100644 index 5e0ce97d..00000000 --- a/ghy-payment/src/main/java/com/ghy/payment/PaymentApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ghy.payment; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class PaymentApplication { - - public static void main(String[] args) { - SpringApplication.run(PaymentApplication.class, args); - } - -} diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java new file mode 100644 index 00000000..c8b47674 --- /dev/null +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java @@ -0,0 +1,10 @@ +package com.ghy.payment.domain; + +import com.ghy.common.core.domain.BaseEntity; + +/** + * @author clunt + * 财务细单(分佣) + */ +public class FinancialDetail extends BaseEntity { +} diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java new file mode 100644 index 00000000..a276eb51 --- /dev/null +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java @@ -0,0 +1,13 @@ +package com.ghy.payment.domain; + +import com.ghy.common.core.domain.BaseEntity; + +/** + * @author clunt + * 财务单主单(对应付款) + */ +public class FinancialMaster extends BaseEntity { + + + +} diff --git a/ghy-payment/src/main/java/com/ghy/payment/package-info.java b/ghy-payment/src/main/java/com/ghy/payment/package-info.java new file mode 100644 index 00000000..c6c26132 --- /dev/null +++ b/ghy-payment/src/main/java/com/ghy/payment/package-info.java @@ -0,0 +1 @@ +package com.ghy.payment; \ No newline at end of file