Commit Graph

15 Commits (ef3c6e81c7f3135b4de2c84f69dd60ecb5f124bd)

Author SHA1 Message Date
duhui ef3c6e81c7 网页支付 2021-09-22 18:34:44 +08:00
duhui a298850c48 网页支付 2021-08-25 17:32:14 +08:00
lvxinran c414784114 删除多余代码 2021-07-21 13:59:02 +08:00
lvxinran 88871d789a Merge branch 'master_test_gn' into master_test_gn_arena
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2021-08-01 08:08:27 +08:00
lvxinran e086327b3e 日志打印 2021-07-08 02:37:27 +08:00
lvxinran 3294d64d30 热更修改 2021-07-08 02:33:14 +08:00
lvxinran d86d08821b 修改启服报错 2021-07-01 18:29:39 +08:00
lvxinran e47eaeb8bd 跨服分组第一版 2021-06-23 14:29:54 +08:00
mengchengzhen 0370572c7c 活动礼包刷新 2021-05-31 17:55:50 +08:00
lvxinran 0fe6f9bc76 礼包一键 2021-05-14 14:30:35 +08:00
mengchengzhen 27aa32bd23 新礼包 2021-04-26 17:27:54 +08:00
mengchengzhen 54a3149de6 Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java
2021-04-26 12:01:08 +08:00
mengchengzhen 2cac69ffcb 新礼包 2021-04-22 17:43:30 +08:00
mengchengzhen 7d91d069aa 新礼包测试 2021-04-22 13:55:20 +08:00
mengchengzhen 4ffb494609 礼包优化1 2021-05-14 17:05:27 +08:00