Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

xuhy

2024-12-30 c9b82feb62c72d7f19ad2716211137cc2db6b701

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

# Conflicts:
#	.idea/modules.xml

 applet/src/main/java/com/jilongda/applet/model/TOrder.java

@@ -171,7 +171,7 @@
    @ApiModelProperty(value = "毛利率")
    @TableField("profitRating")
    private BigDecimal profitRating;
    @ApiModelProperty(value = "验光来源")
    @ApiModelProperty(value = "验光来源 1=外部验光 2=门店修改 3=客户自改")
    @TableField("profitRating")
    private Integer optometrySource;
}

 manage/src/main/java/com/jilongda/manage/model/TOrder.java

@@ -171,7 +171,7 @@
    @ApiModelProperty(value = "毛利率")
    @TableField("profitRating")
    private BigDecimal profitRating;
    @ApiModelProperty(value = "验光来源")
    @ApiModelProperty(value = "验光来源 1=外部验光 2=门店修改 3=客户自改")
    @TableField("profitRating")
    private Integer optometrySource;
}

 manage/src/main/resources/mapping/TOrderAftersalesMapper.xml

@@ -24,7 +24,7 @@
    </sql>
    <select id="pageList" resultType="com.jilongda.manage.vo.TOrderAftersalesVO">
        select toa.id, toa.code, toa.sysId, toa.optometristId, toa.orderId, toa.reason, toa.handleResult, toa.createTime, toa.updateTime,
               toa.createBy, toa.updateBy, toa.isDelete,tau.name, tau.phone, tau.realName, ts.storeName, o.orderMoney
               toa.createBy, toa.updateBy, toa.isDelete,tau.name, tau.phone, tau.realName, ts.name as storeName, o.orderMoney
        from t_order_aftersales toa
        left join t_app_user tau on toa.sysId = tau.id
        left join t_store ts on toa.storeId = ts.id